Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update 24.10-devel branch with main #1095

Merged
merged 3 commits into from
Oct 13, 2024
Merged

Update 24.10-devel branch with main #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
032e978
Do not add leading "//tests:" for given test targets (#1079)
gpupuck Oct 3, 2024
d1ff3c8
Pin etils to fix error with `tfds.load` (#1086)
ashors1 Oct 8, 2024
e8043a5
Improve TE test reporting, increase timeout (#1084)
olupton Oct 10, 2024
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
3 changes: 3 additions & 0 deletions .github/container/Dockerfile.pax.amd64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ for src in ${SRC_PATH_PAXML} ${SRC_PATH_PRAXIS}; do
pushd ${src}
sed -i "s| @ git+https://github.com/google/flax||g" requirements.in
sed -i "s| @ git+https://github.com/google/jax||g" requirements.in
## we pin etils because newer etils versions are not compatible with the
## version of TFDS required by Pax
sed -i "s/etils/etils==1.7.0/g" requirements.in
if git diff --quiet; then
echo "URL specs no longer present in select dependencies for ${src}"
exit 1
Expand Down
3 changes: 0 additions & 3 deletions .github/container/test-jax.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,6 @@ else
fi

for t in $*; do
if [[ "$t" != "//tests:"* ]]; then
t="//tests:${t}"
fi
BAZEL_TARGET="${BAZEL_TARGET} $t"
done

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/_ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,13 +528,14 @@ jobs:
STATISTICS_SCRIPT: |
summary_line=$(tail -n1 test-te.log)
errors=$(echo $summary_line | grep -oE '[0-9]+ error' | awk '{print $1} END { if (!NR) print 0}')
passed_tests=$(cat pytest-report.jsonl | jq -r 'select(."$report_type" == "CollectReport" and .outcome == "passed") | .outcome' | wc -l)
failed_tests=$(cat pytest-report.jsonl | jq -r 'select(."$report_type" == "CollectReport" and .outcome == "failed") | .outcome' | wc -l)
passed_tests=$(cat pytest-report.jsonl | jq -r 'select(."$report_type" == "TestReport" and .when == "call" and .outcome == "passed") | .outcome' | wc -l)
failed_tests=$(cat pytest-report.jsonl | jq -r 'select(."$report_type" == "TestReport" and .when == "call" and .outcome == "failed") | .outcome' | wc -l)
total_tests=$((failed_tests + passed_tests))
echo "TOTAL_TESTS=${total_tests}" >> $GITHUB_OUTPUT
echo "ERRORS=${errors}" >> $GITHUB_OUTPUT
echo "PASSED_TESTS=${passed_tests}" >> $GITHUB_OUTPUT
echo "FAILED_TESTS=${failed_tests}" >> $GITHUB_OUTPUT
TIMEOUT_MINUTES: 120
ARTIFACTS: |
test-te.log
pytest-report.jsonl
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/_test_unit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@ on:
type: string
description: 'Test artifacts to collect'
required: false
TIMEOUT_MINUTES:
type: number
description: 'Maximum test runtime, in minutes'
default: 60

jobs:
runner:
uses: ./.github/workflows/_runner_ondemand_slurm.yaml
with:
NAME: "A100"
LABELS: "A100,${{ github.run_id }}"
TIME: "01:00:00"
TIME: "${{ inputs.TIMEOUT_MINUTES }}:00"
secrets: inherit

run-unit-test:
Expand Down Expand Up @@ -67,6 +71,7 @@ jobs:
- name: Run tests
shell: bash -x -e {0}
continue-on-error: true
timeout-minutes: ${{ inputs.TIMEOUT_MINUTES }}
run: |
${{ inputs.EXECUTE }}

Expand Down
Loading