Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
539e79b
run pre-commit and fix all the issues
marta-sd Sep 5, 2025
5b26a51
move tests to unit_tests subdir and add Launch_Unit_Tests.sh
marta-sd Sep 5, 2025
a01ce08
add launcher to docker building
marta-sd Sep 5, 2025
1bc5a9f
try to enable launcher tests in CI
marta-sd Sep 5, 2025
34f3a62
lint
marta-sd Sep 5, 2025
c63a726
fix import in test
marta-sd Sep 5, 2025
0f05aac
try to use globabl pre-commit
marta-sd Sep 5, 2025
9082452
update global pyproject.toml
marta-sd Sep 5, 2025
6b61d6b
add cp headers
marta-sd Sep 5, 2025
eb35253
try to configure isort
marta-sd Sep 5, 2025
f56f95e
add nemo-evaluator-launcher/tests/__init__.py
marta-sd Sep 5, 2025
3b82e2c
update uv.lock
marta-sd Sep 5, 2025
ea073b1
try to build per-package docker image
marta-sd Sep 5, 2025
ce0a9f5
remove undefined UV_ARGS
marta-sd Sep 5, 2025
6063d71
copy package uv.lock to main dir
marta-sd Sep 5, 2025
03feada
remove global pyproject.toml (I'm trying to separate the installation)
marta-sd Sep 8, 2025
8040bd1
update lock files
marta-sd Sep 8, 2025
076efbc
copy uv.lock in the right place(?)
marta-sd Sep 8, 2025
cac79be
switch to uv
marta-sd Sep 8, 2025
32d4ac4
fix docker building
marta-sd Sep 8, 2025
12ff32f
bulk update from internal version
marta-sd Sep 8, 2025
b82c983
udpate tests and set known-first-party
marta-sd Sep 8, 2025
b38287e
set known-first-party for nemo-evaluator too
marta-sd Sep 8, 2025
b4ac1db
fix linting in nemo-evaluator tests
marta-sd Sep 8, 2025
7a4c6ae
update uv.lock
marta-sd Sep 8, 2025
1667d53
remove coverage combine and run tests/uni_tests for launcher
marta-sd Sep 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 36 additions & 7 deletions .github/workflows/cicd-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ jobs:

- name: Check lint
run: |
cd packages/nemo-evaluator

pip install pre-commit==3.6.0
pre-commit install
pre-commit run --all-files --show-diff-on-failure --color=always
Expand All @@ -71,7 +69,7 @@ jobs:
run: |
echo "Running CI tests"

cicd-unit-tests:
cicd-unit-tests-nemo-evaluator:
needs: [pre-flight, cicd-wait-in-queue]
runs-on: ubuntu-latest
name: unit-tests
Expand Down Expand Up @@ -100,8 +98,38 @@ jobs:
PAT: ${{ secrets.PAT }}
package: nemo-evaluator

cicd-e2e-tests:
needs: [pre-flight, cicd-unit-tests]

cicd-unit-tests-nemo-evaluator-launcher:
needs: [pre-flight, cicd-wait-in-queue]
runs-on: ubuntu-latest
name: unit-tests
environment: nemo-ci
if: |
(
success()
|| needs.pre-flight.outputs.is_ci_workload == 'true'
|| needs.pre-flight.outputs.force_run_all == 'true'
)
&& !cancelled()
steps:
- name: Checkout
uses: actions/checkout@v4
- name: main
uses: ./.github/actions/test-template
with:
script: Launch_Unit_Tests
timeout: 10
is_unit_test: "true"
cpu-only: true
has-azure-credentials: "true"
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
PAT: ${{ secrets.PAT }}
package: nemo-evaluator-launcher

cicd-e2e-tests-nemo-evaluator:
needs: [pre-flight, cicd-unit-tests-nemo-evaluator]
runs-on: ubuntu-latest
name: functional-tests
environment: nemo-ci
Expand Down Expand Up @@ -131,8 +159,9 @@ jobs:
Nemo_CICD_Test:
needs:
- pre-flight
- cicd-unit-tests
- cicd-e2e-tests
- cicd-unit-tests-nemo-evaluator
- cicd-unit-tests-nemo-evaluator-launcher
- cicd-e2e-tests-nemo-evaluator
if: |
(
needs.pre-flight.outputs.docs_only == 'true'
Expand Down
File renamed without changes.
6 changes: 4 additions & 2 deletions docker/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@

FROM ubuntu:24.04
WORKDIR /workspace
COPY . .
ARG PACKAGE
COPY packages/${PACKAGE} packages/${PACKAGE}
COPY packages/${PACKAGE}/uv.lock packages/${PACKAGE}/uv.lock
COPY docker docker
ARG PYTHON_VERSION=3.12
ENV UV_PROJECT_ENVIRONMENT=/opt/venv
ENV PATH="/opt/venv/bin:$PATH"
ENV UV_LINK_MODE=copy
ENV HOME=/root
ENV PATH="$HOME/.local/bin:$PATH"
RUN bash docker/common/install.sh --package $PACKAGE --python-version "$PYTHON_VERSION" --use-uv $USE_UV
RUN bash docker/common/install.sh --package $PACKAGE --python-version "$PYTHON_VERSION" --use-uv
15 changes: 7 additions & 8 deletions docker/common/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@ while [[ $# -gt 0 ]]; do
;;
*)
echo "Unknown option: $1"
echo "Usage: $0 --package {nemo-evaluator} --python-version {3.10|3.11|3.12}"
echo "Usage: $0 --package {nemo-evaluator|nemo-evaluator-launcher} --python-version {3.10|3.11|3.12}"
exit 1
;;
esac
done

if [[ -z "${PACKAGE:-}" || -z "${PYTHON_VERSION:-}" ]]; then
echo "Error: --package argument is required"
echo "Usage: $0 --package {nemo-evaluator} --python-version {3.10|3.11|3.12}"
echo "Usage: $0 --package {nemo-evaluator|nemo-evaluator-launcher --python-version {3.10|3.11|3.12}"
exit 1
fi

if [[ "$PACKAGE" != "nemo-evaluator" || ("$PYTHON_VERSION" != "3.10" && "$PYTHON_VERSION" != "3.11" && "$PYTHON_VERSION" != "3.12") ]]; then
echo "Error: --package must be either 'nemo-evaluator' and --python-version must be either '3.10', '3.11', or '3.12'"
echo "Usage: $0 --package {nemo-evaluator} --python-version {3.10|3.11|3.12}"
if [[ ("$PACKAGE" != "nemo-evaluator" && "$PACKAGE" != "nemo-evaluator-launcher") || ("$PYTHON_VERSION" != "3.10" && "$PYTHON_VERSION" != "3.11" && "$PYTHON_VERSION" != "3.12") ]]; then
echo "Error: --package must be either 'nemo-evaluator' or 'nemo-evaluator-launcher' and --python-version must be either '3.10', '3.11', or '3.12'"
echo "Usage: $0 --package {nemo-evaluator|nemo-evaluator-launcher} --python-version {3.10|3.11|3.12}"
exit 1
fi

Expand Down Expand Up @@ -85,14 +85,13 @@ main() {
export UV_LINK_MODE=copy

# Create virtual environment and install dependencies
uv venv ${UV_PROJECT_ENVIRONMENT} $([[ "$BASE_IMAGE" == "pytorch" ]] && echo "--system-site-packages")
uv venv ${UV_PROJECT_ENVIRONMENT}

# Install dependencies
uv sync --locked --only-group build ${UV_ARGS[@]}
uv sync \
--link-mode copy \
--locked \
--all-groups ${UV_ARGS[@]}
--all-groups

# Install the package
uv pip install --no-deps -e .
Expand Down
234 changes: 0 additions & 234 deletions packages/nemo-evaluator-launcher/OSS_README.md

This file was deleted.

Loading
Loading