Skip to content

Commit 25d1c77

Browse files
committed
fix @olupton comments
1 parent dd22aaf commit 25d1c77

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.github/container/test-axlearn.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,18 +219,22 @@ done
219219
# SUMMARY STATUS
220220
passed=0
221221
failed=0
222+
error=0
222223
skipped=0
223224
for log in ${LOG_DIRECTORY}/log_*.log; do
224225
count_pass=$(grep -Eo '[0-9]+ passed' "${log}" | awk '{print $1}' || true)
225226
count_fail=$(grep -Eo '[0-9]+ failed' "${log}" | awk '{print $1}' || true)
227+
count_error=$(grep -Eo '[0-9]+ error' "${log}" | awk '{print $1}' || true)
226228
count_skipped=$(grep -Eo '[0-9]+ skipped' "${log}" | awk '{print $1}' || true)
227229
# in case of None
228230
count_pass=${count_pass:-0}
229231
count_fail=${count_fail:-0}
232+
count_error=${count_error:-0}
230233
count_skipped=${count_skipped:-0}
231234
# count all the tests
232235
(( passed += count_pass ))
233236
(( failed += count_fail ))
237+
(( failed += count_error ))
234238
(( skipped += count_skipped ))
235239
done
236240

.github/eks-workflow-files/axlearn/axlearn-job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
LOG_DIR="/output/${RUN_ID}"
2323
mkdir -p ${LOG_DIR}
2424
# test on JAX, make sure 8 devices are visible
25-
pytest-xdist.sh 8 8 ${LOG_DIR}/axlearn-unittests.jsonl test-axlearn.sh --directory "." --output ${LOG_DIR} --test-files "/opt/axlearn/axlearn/common/*_test.py"
25+
pytest-xdist.sh 8 4 ${LOG_DIR}/axlearn-unittests.jsonl test-axlearn.sh --directory "." --output ${LOG_DIR} --test-files "/opt/axlearn/axlearn/common/*_test.py"
2626
env:
2727
- name: RUN_ID
2828
value: PLACEHOLDER

.github/workflows/_ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -616,14 +616,14 @@ jobs:
616616
id: log-s3
617617
run: |
618618
mkdir -p axlearn-output
619-
aws s3 cp s3://jax-toolbox-eks-output/axlearn/${{ github.run_id }}/logs/summary.txt axlearn_output/
620-
aws s3 cp s3://jax-toolbox-eks-output/axlearn/${{ github.run_id }}/logs/ axlearn_output/ --recursive --exclude "*" --include "*.log"
621-
aws s3 cp s3://jax-toolbox-eks-output/axlearn/${{ github.run_id }}/logs/ axlearn_output/ --recursive --exclude "*" --include "*.xml"
619+
aws s3 cp s3://jax-toolbox-eks-output/axlearn/${{ github.run_id }}/logs/summary.txt axlearn-output/
620+
aws s3 cp s3://jax-toolbox-eks-output/axlearn/${{ github.run_id }}/logs/ axlearn-output/ --recursive --exclude "*" --include "*.log"
621+
aws s3 cp s3://jax-toolbox-eks-output/axlearn/${{ github.run_id }}/logs/ axlearn-output/ --recursive --exclude "*" --include "*.xml"
622622
623623
624-
passed_tests=$(grep -Eo 'PASSED:[[:space:]]*[0-9]+' axlearn_output/summary.txt | grep -Eo '[0-9]+' )
625-
failed_tests=$(grep -Eo 'FAILED:[[:space:]]*[0-9]+' axlearn_output/summary.txt | grep -Eo '[0-9]+' )
626-
skipped_tests=$(grep -Eo 'SKIPPED:[[:space:]]*[0-9]+' axlearn_output/summary.txt | grep -Eo '[0-9]+' )
624+
passed_tests=$(grep -Eo 'PASSED:[[:space:]]*[0-9]+' axlearn-output/summary.txt | grep -Eo '[0-9]+' )
625+
failed_tests=$(grep -Eo 'FAILED:[[:space:]]*[0-9]+' axlearn-output/summary.txt | grep -Eo '[0-9]+' )
626+
skipped_tests=$(grep -Eo 'SKIPPED:[[:space:]]*[0-9]+' axlearn-output/summary.txt | grep -Eo '[0-9]+' )
627627
total_tests=$((failed_tests + passed_tests + skipped_tests))
628628
629629
echo "Passed tests: $passed_tests"

0 commit comments

Comments
 (0)