diff --git a/.github/actions/test-sde/action.yml b/.github/actions/test-sde/action.yml index 6ae9bb483..7624728ec 100644 --- a/.github/actions/test-sde/action.yml +++ b/.github/actions/test-sde/action.yml @@ -16,5 +16,5 @@ runs: - run: | WORK_DIR=`pwd` cd ../../builds/Ray/tests - sde ${{ inputs.sde-args }} -- $WORK_DIR/${{ inputs.bin-dir }}/test_Ray -j4 ${{ inputs.test-args }} + sde ${{ inputs.sde-args }} -- $WORK_DIR/${{ inputs.bin-dir }}/test_Ray ${{ inputs.test-args }} shell: bash diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 2e915d933..446ac2b3c 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -19,5 +19,5 @@ runs: chmod +x ./${{ inputs.bin-dir }}/${{ inputs.bin-name }} WORK_DIR=`pwd` cd ../../builds/Ray/tests - $WORK_DIR/${{ inputs.bin-dir }}/${{ inputs.bin-name }} -j4 ${{ inputs.test-args }} + $WORK_DIR/${{ inputs.bin-dir }}/${{ inputs.bin-name }} ${{ inputs.test-args }} shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 193c40b32..491c388a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "windows-x86_64" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-windows-x86_64-gpu-nv: runs-on: [ windows, x86_64, nv ] needs: @@ -131,7 +131,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "windows-x86_64" - test-args: "--device AMD --nocpu" + test-args: "--device AMD --nocpu -vl 1" test-windows-x86_64-gpu-arc: runs-on: [ windows, x86_64, arc ] needs: @@ -147,7 +147,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "windows-x86_64" - test-args: "--device Arc --nocpu" + test-args: "--device Arc --nocpu -vl 1" test-windows-x86_64-gpu-xe: runs-on: [ windows, x86_64, xe ] needs: @@ -163,7 +163,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "windows-x86_64" - test-args: "--device Xe --nocpu" + test-args: "--device Xe --nocpu -vl 1" test-windows-arm64-cpu: runs-on: [ windows, arm64 ] needs: @@ -179,7 +179,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "windows-arm64" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-windows-arm64-gpu-adreno: runs-on: [ windows, arm64, adreno ] needs: @@ -195,7 +195,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "windows-arm64" - test-args: "--device Adreno --nocpu" + test-args: "--device Adreno --nocpu -vl 1" test-linux-x86_64-cpu: runs-on: [ linux, x86_64 ] needs: @@ -211,7 +211,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "linux-x86_64" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-linux-x86_64-gpu-amd: runs-on: [ linux, x86_64, amd ] needs: @@ -227,7 +227,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "linux-x86_64" - test-args: "--device AMD --nocpu --nohwrt" + test-args: "--device AMD --nocpu --nohwrt -vl 1" test-linux-x86_64-gpu-nv: runs-on: [ linux, x86_64, nv ] needs: @@ -243,7 +243,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "linux-x86_64" - test-args: "--device NV --nocpu" + test-args: "--device NV --nocpu -vl 1" test-macos-arm64-cpu: runs-on: [ macos, arm64 ] needs: @@ -259,7 +259,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "macos-universal" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-macos-arm64-gpu-m1: runs-on: [ macos, arm64, m1 ] needs: @@ -275,7 +275,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "macos-universal" - test-args: "--device M1 --nocpu" + test-args: "--device M1 --nocpu -vl 1" test-macos-x86_64-cpu: runs-on: [ macos, x86_64 ] needs: @@ -291,4 +291,4 @@ jobs: uses: ./.github/actions/test with: bin-dir: "macos-universal" - test-args: "--nogpu" + test-args: "--nogpu -j4" diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml index de6d40030..8f9b9bbe3 100644 --- a/.github/workflows/schedule.yml +++ b/.github/workflows/schedule.yml @@ -294,7 +294,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "windows-x86_64" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-windows-x86_64-gpu-nv: runs-on: [ windows, x86_64, nv ] needs: @@ -374,7 +374,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "windows-arm64" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-windows-arm64-gpu-adreno: runs-on: [ windows, arm64, adreno ] needs: @@ -406,7 +406,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "linux-x86_64" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-linux-x86_64-gpu-amd: runs-on: [ linux, x86_64, amd ] needs: @@ -454,7 +454,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "macos-universal" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-macos-arm64-gpu-m1: runs-on: [ macos, arm64, m1 ] needs: @@ -486,7 +486,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "macos-universal" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-windows-x86_64-cpu-sse2: runs-on: [ windows, x86_64, win10 ] needs: @@ -502,7 +502,7 @@ jobs: uses: ./.github/actions/test-sde with: bin-dir: "windows-x86_64" - test-args: "--arch SSE2 --nogpu" + test-args: "--arch SSE2 --nogpu -j4" sde-args: "-p4p" test-windows-x86_64-cpu-sse41: runs-on: [ windows, x86_64, win10 ] @@ -519,7 +519,7 @@ jobs: uses: ./.github/actions/test-sde with: bin-dir: "windows-x86_64" - test-args: "--arch SSE41 --nogpu" + test-args: "--arch SSE41 --nogpu -j4" sde-args: "-pnr" test-windows-x86_64-cpu-avx: runs-on: [ windows, x86_64 ] @@ -536,7 +536,7 @@ jobs: uses: ./.github/actions/test-sde with: bin-dir: "windows-x86_64" - test-args: "--arch AVX --nogpu" + test-args: "--arch AVX --nogpu -j4" sde-args: "-snb" test-windows-x86_64-cpu-avx2: runs-on: [ windows, x86_64 ] @@ -553,7 +553,7 @@ jobs: uses: ./.github/actions/test-sde with: bin-dir: "windows-x86_64" - test-args: "--arch AVX2 --nogpu" + test-args: "--arch AVX2 --nogpu -j4" sde-args: "-hsw" test-windows-x86_64-cpu-avx512: runs-on: [ windows, x86_64 ] @@ -570,7 +570,7 @@ jobs: uses: ./.github/actions/test-sde with: bin-dir: "windows-x86_64" - test-args: "--arch AVX512 --nogpu" + test-args: "--arch AVX512 --nogpu -j4" sde-args: "-future" test-linux-x86_64-cpu-tsan: runs-on: [ linux, x86_64 ] @@ -588,7 +588,7 @@ jobs: with: bin-name: "test_Ray-tsan" bin-dir: "linux-x86_64-tsan" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-windows-x86_64-cpu-asan: runs-on: [ windows, x86_64 ] needs: @@ -605,7 +605,7 @@ jobs: with: bin-name: "test_Ray-asan" bin-dir: "windows-x86_64-asan" - test-args: "--nogpu" + test-args: "--nogpu -j4" test-windows-x86_64-gpu-nv-asan: runs-on: [ windows, x86_64, nv ] needs: @@ -638,7 +638,7 @@ jobs: uses: ./.github/actions/test with: bin-dir: "windows-arm64" - test-args: "--nogpu --time_limit 2.95" + test-args: "--nogpu -j4 --time_limit 2.95" test-windows-arm64-gpu-perf: runs-on: [ windows, arm64, perf, adreno ] needs: @@ -654,4 +654,4 @@ jobs: uses: ./.github/actions/test with: bin-dir: "windows-arm64" - test-args: "--nocpu --time_limit 5.4" + test-args: "--nocpu -j4 --time_limit 5.4" diff --git a/tests/main.cpp b/tests/main.cpp index 9f23bfe3f..d47265c66 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -186,9 +186,7 @@ int main(int argc, char *argv[]) { threads_count = 1; } - if (threads_count > 1) { - g_minimal_output = true; - } + g_minimal_output = true; #if defined(_WIN32) && !defined(__clang__) const bool enable_fp_exceptions = !nocpu || full_tests;