diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 350336ca..8be15d9d 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -107,29 +107,29 @@ jobs: with: name: windows-x86_64-cpu-output path: windows-x86_64-cpu-output/ - # test-windows-x86_64-gpu-nv: - # runs-on: [ windows, x86_64, nv ] - # needs: - # - build-windows-x86_64-rel - # steps: - # - name: Checkout Workflows - # uses: actions/checkout@v4 - # with: - # sparse-checkout: .gitea - # - name: Re-initialize repository - # uses: ./.gitea/actions/checkout - # - name: Run Tests - # uses: ./.gitea/actions/test - # with: - # bin-dir: "windows-x86_64" - # out-dir: "windows-x86_64-gpu-nv-output" - # test-args: "--device NV --nocpu" - # - name: Upload artifacts - # uses: actions/upload-artifact@v3 - # if: always() - # with: - # name: windows-x86_64-gpu-nv-output - # path: windows-x86_64-gpu-nv-output/ + test-windows-x86_64-gpu-nv: + runs-on: [ windows, x86_64, nv ] + needs: + - build-windows-x86_64-rel + steps: + - name: Checkout Workflows + uses: actions/checkout@v4 + with: + sparse-checkout: .gitea + - name: Re-initialize repository + uses: ./.gitea/actions/checkout + - name: Run Tests + uses: ./.gitea/actions/test + with: + bin-dir: "windows-x86_64" + out-dir: "windows-x86_64-gpu-nv-output" + test-args: "--device NV --nocpu" + - name: Upload artifacts + uses: actions/upload-artifact@v3 + if: always() + with: + name: windows-x86_64-gpu-nv-output + path: windows-x86_64-gpu-nv-output/ test-windows-x86_64-gpu-amd: runs-on: [ windows, x86_64, amd ] needs: @@ -386,7 +386,7 @@ jobs: path: macos-x86_64-cpu-output/ analyze-output: runs-on: [ linux ] - needs: [ test-windows-x86_64-cpu, test-windows-x86_64-gpu-amd, test-windows-x86_64-gpu-uhd, test-windows-x86_64-gpu-arc, test-linux-x86_64-cpu, test-linux-x86_64-gpu-nv, test-macos-arm64-cpu, test-macos-arm64-gpu-m4, test-macos-x86_64-cpu ] + needs: [ test-windows-x86_64-cpu, test-windows-x86_64-gpu-nv, test-windows-x86_64-gpu-amd, test-windows-x86_64-gpu-uhd, test-windows-x86_64-gpu-arc, test-linux-x86_64-cpu, test-linux-x86_64-gpu-nv, test-macos-arm64-cpu, test-macos-arm64-gpu-m4, test-macos-x86_64-cpu ] if: always() steps: - name: Checkout Workflows @@ -397,10 +397,10 @@ jobs: with: name: windows-x86_64-cpu-output path: windows-x86_64-cpu-output/ - # - uses: actions/download-artifact@v3 - # with: - # name: windows-x86_64-gpu-nv-output - # path: windows-x86_64-gpu-nv-output/ + - uses: actions/download-artifact@v3 + with: + name: windows-x86_64-gpu-nv-output + path: windows-x86_64-gpu-nv-output/ - uses: actions/download-artifact@v3 with: name: windows-x86_64-gpu-amd-output @@ -447,5 +447,5 @@ jobs: path: macos-x86_64-cpu-output/ - name: Analyze Output run: | - python scripts/analyze_output.py windows-x86_64-cpu-output/test_Ray_output.txt windows-x86_64-gpu-amd-output/test_Ray_output.txt windows-x86_64-gpu-uhd-output/test_Ray_output.txt windows-x86_64-gpu-arc-output/test_Ray_output.txt linux-x86_64-cpu-output/test_Ray_output.txt linux-x86_64-gpu-nv-output/test_Ray_output.txt macos-arm64-cpu-output/test_Ray_output.txt macos-arm64-gpu-m4-output/test_Ray_output.txt macos-x86_64-cpu-output/test_Ray_output.txt + python scripts/analyze_output.py windows-x86_64-cpu-output/test_Ray_output.txt windows-x86_64-gpu-nv-output/test_Ray_output.txt windows-x86_64-gpu-amd-output/test_Ray_output.txt windows-x86_64-gpu-uhd-output/test_Ray_output.txt windows-x86_64-gpu-arc-output/test_Ray_output.txt linux-x86_64-cpu-output/test_Ray_output.txt linux-x86_64-gpu-nv-output/test_Ray_output.txt macos-arm64-cpu-output/test_Ray_output.txt macos-arm64-gpu-m4-output/test_Ray_output.txt macos-x86_64-cpu-output/test_Ray_output.txt shell: bash \ No newline at end of file diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index c5277f95..4de0582e 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -303,29 +303,29 @@ jobs: with: name: windows-x86_64-cpu-output path: windows-x86_64-cpu-output/ - # test-windows-x86_64-gpu-nv: - # runs-on: [ windows, x86_64, nv ] - # needs: - # - build-windows-x86_64-rel - # steps: - # - name: Checkout Workflows - # uses: actions/checkout@v4 - # with: - # sparse-checkout: .gitea - # - name: Re-initialize repository - # uses: ./.gitea/actions/checkout - # - name: Run Tests - # uses: ./.gitea/actions/test - # with: - # bin-dir: "windows-x86_64" - # out-dir: "windows-x86_64-gpu-nv-output" - # test-args: "--full --device NV --nocpu" - # - name: Upload artifacts - # uses: actions/upload-artifact@v3 - # if: always() - # with: - # name: windows-x86_64-gpu-nv-output - # path: windows-x86_64-gpu-nv-output/ + test-windows-x86_64-gpu-nv: + runs-on: [ windows, x86_64, nv ] + needs: + - build-windows-x86_64-rel + steps: + - name: Checkout Workflows + uses: actions/checkout@v4 + with: + sparse-checkout: .gitea + - name: Re-initialize repository + uses: ./.gitea/actions/checkout + - name: Run Tests + uses: ./.gitea/actions/test + with: + bin-dir: "windows-x86_64" + out-dir: "windows-x86_64-gpu-nv-output" + test-args: "--full --device NV --nocpu" + - name: Upload artifacts + uses: actions/upload-artifact@v3 + if: always() + with: + name: windows-x86_64-gpu-nv-output + path: windows-x86_64-gpu-nv-output/ test-windows-x86_64-gpu-amd: runs-on: [ windows, x86_64, amd ] needs: @@ -820,7 +820,7 @@ jobs: # path: windows-arm64-gpu-perf-output/ analyze-output: runs-on: [ linux ] - needs: [ test-windows-x86_64-cpu, test-windows-x86_64-gpu-amd, test-windows-x86_64-gpu-uhd, test-windows-x86_64-gpu-arc, test-linux-x86_64-cpu, test-linux-x86_64-gpu-nv, test-linux-x86_64-cpu-sse41, test-windows-x86_64-cpu-avx, test-windows-x86_64-cpu-avx2, test-windows-x86_64-cpu-avx512, test-linux-x86_64-cpu-tsan, test-windows-x86_64-cpu-asan, test-windows-x86_64-gpu-amd-asan, test-macos-arm64-cpu, test-macos-arm64-gpu-m4, test-macos-x86_64-cpu ] + needs: [ test-windows-x86_64-cpu, test-windows-x86_64-gpu-nv, test-windows-x86_64-gpu-amd, test-windows-x86_64-gpu-uhd, test-windows-x86_64-gpu-arc, test-linux-x86_64-cpu, test-linux-x86_64-gpu-nv, test-linux-x86_64-cpu-sse41, test-windows-x86_64-cpu-avx, test-windows-x86_64-cpu-avx2, test-windows-x86_64-cpu-avx512, test-linux-x86_64-cpu-tsan, test-windows-x86_64-cpu-asan, test-windows-x86_64-gpu-amd-asan, test-macos-arm64-cpu, test-macos-arm64-gpu-m4, test-macos-x86_64-cpu ] if: always() steps: - name: Checkout Workflows @@ -831,10 +831,10 @@ jobs: with: name: windows-x86_64-cpu-output path: windows-x86_64-cpu-output/ - # - uses: actions/download-artifact@v3 - # with: - # name: windows-x86_64-gpu-nv-output - # path: windows-x86_64-gpu-nv-output/ + - uses: actions/download-artifact@v3 + with: + name: windows-x86_64-gpu-nv-output + path: windows-x86_64-gpu-nv-output/ - uses: actions/download-artifact@v3 with: name: windows-x86_64-gpu-amd-output @@ -921,5 +921,5 @@ jobs: # path: windows-arm64-gpu-perf-output/ - name: Analyze Output run: | - python scripts/analyze_output.py windows-x86_64-cpu-output/test_Ray_output.txt windows-x86_64-gpu-amd-output/test_Ray_output.txt windows-x86_64-gpu-uhd-output/test_Ray_output.txt windows-x86_64-gpu-arc-output/test_Ray_output.txt linux-x86_64-cpu-output/test_Ray_output.txt linux-x86_64-gpu-nv-output/test_Ray_output.txt linux-x86_64-cpu-sse41-output/test_Ray_output.txt windows-x86_64-cpu-avx-output/test_Ray_output.txt windows-x86_64-cpu-avx2-output/test_Ray_output.txt windows-x86_64-cpu-avx512-output/test_Ray_output.txt linux-x86_64-cpu-tsan-output/test_Ray_output.txt windows-x86_64-cpu-asan-output/test_Ray_output.txt windows-x86_64-gpu-amd-asan-output/test_Ray_output.txt macos-arm64-cpu-output/test_Ray_output.txt macos-arm64-gpu-m4-output/test_Ray_output.txt macos-x86_64-cpu-output/test_Ray_output.txt + python scripts/analyze_output.py windows-x86_64-cpu-output/test_Ray_output.txt windows-x86_64-gpu-nv-output/test_Ray_output.txt windows-x86_64-gpu-amd-output/test_Ray_output.txt windows-x86_64-gpu-uhd-output/test_Ray_output.txt windows-x86_64-gpu-arc-output/test_Ray_output.txt linux-x86_64-cpu-output/test_Ray_output.txt linux-x86_64-gpu-nv-output/test_Ray_output.txt linux-x86_64-cpu-sse41-output/test_Ray_output.txt windows-x86_64-cpu-avx-output/test_Ray_output.txt windows-x86_64-cpu-avx2-output/test_Ray_output.txt windows-x86_64-cpu-avx512-output/test_Ray_output.txt linux-x86_64-cpu-tsan-output/test_Ray_output.txt windows-x86_64-cpu-asan-output/test_Ray_output.txt windows-x86_64-gpu-amd-asan-output/test_Ray_output.txt macos-arm64-cpu-output/test_Ray_output.txt macos-arm64-gpu-m4-output/test_Ray_output.txt macos-x86_64-cpu-output/test_Ray_output.txt shell: bash \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c82a8ba3..695f50e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,29 +107,29 @@ jobs: with: name: windows-x86_64-cpu-output path: windows-x86_64-cpu-output/ - # test-windows-x86_64-gpu-nv: - # runs-on: [ windows, x86_64, nv ] - # needs: - # - build-windows-x86_64-rel - # steps: - # - name: Checkout Workflows - # uses: actions/checkout@v4 - # with: - # sparse-checkout: .github - # - name: Re-initialize repository - # uses: ./.github/actions/checkout - # - name: Run Tests - # uses: ./.github/actions/test - # with: - # bin-dir: "windows-x86_64" - # out-dir: "windows-x86_64-gpu-nv-output" - # test-args: "--device NV --nocpu" - # - name: Upload artifacts - # uses: actions/upload-artifact@v4 - # if: always() - # with: - # name: windows-x86_64-gpu-nv-output - # path: windows-x86_64-gpu-nv-output/ + test-windows-x86_64-gpu-nv: + runs-on: [ windows, x86_64, nv ] + needs: + - build-windows-x86_64-rel + steps: + - name: Checkout Workflows + uses: actions/checkout@v4 + with: + sparse-checkout: .github + - name: Re-initialize repository + uses: ./.github/actions/checkout + - name: Run Tests + uses: ./.github/actions/test + with: + bin-dir: "windows-x86_64" + out-dir: "windows-x86_64-gpu-nv-output" + test-args: "--device NV --nocpu" + - name: Upload artifacts + uses: actions/upload-artifact@v4 + if: always() + with: + name: windows-x86_64-gpu-nv-output + path: windows-x86_64-gpu-nv-output/ test-windows-x86_64-gpu-amd: runs-on: [ windows, x86_64, amd ] needs: @@ -386,7 +386,7 @@ jobs: path: macos-x86_64-cpu-output/ analyze-output: runs-on: [ linux ] - needs: [ test-windows-x86_64-cpu, test-windows-x86_64-gpu-amd, test-windows-x86_64-gpu-uhd, test-windows-x86_64-gpu-arc, test-linux-x86_64-cpu, test-linux-x86_64-gpu-nv, test-macos-arm64-cpu, test-macos-arm64-gpu-m4, test-macos-x86_64-cpu ] + needs: [ test-windows-x86_64-cpu, test-windows-x86_64-gpu-nv, test-windows-x86_64-gpu-amd, test-windows-x86_64-gpu-uhd, test-windows-x86_64-gpu-arc, test-linux-x86_64-cpu, test-linux-x86_64-gpu-nv, test-macos-arm64-cpu, test-macos-arm64-gpu-m4, test-macos-x86_64-cpu ] if: always() steps: - name: Checkout Workflows @@ -398,10 +398,10 @@ jobs: with: name: windows-x86_64-cpu-output path: windows-x86_64-cpu-output/ - # - uses: actions/download-artifact@v4 - # with: - # name: windows-x86_64-gpu-nv-output - # path: windows-x86_64-gpu-nv-output/ + - uses: actions/download-artifact@v4 + with: + name: windows-x86_64-gpu-nv-output + path: windows-x86_64-gpu-nv-output/ - uses: actions/download-artifact@v4 with: name: windows-x86_64-gpu-amd-output @@ -448,5 +448,5 @@ jobs: path: macos-x86_64-cpu-output/ - name: Analyze Output run: | - python scripts/analyze_output.py windows-x86_64-cpu-output/test_Ray_output.txt windows-x86_64-gpu-amd-output/test_Ray_output.txt windows-x86_64-gpu-uhd-output/test_Ray_output.txt windows-x86_64-gpu-arc-output/test_Ray_output.txt linux-x86_64-cpu-output/test_Ray_output.txt linux-x86_64-gpu-nv-output/test_Ray_output.txt macos-arm64-cpu-output/test_Ray_output.txt macos-arm64-gpu-m4-output/test_Ray_output.txt macos-x86_64-cpu-output/test_Ray_output.txt + python scripts/analyze_output.py windows-x86_64-cpu-output/test_Ray_output.txt windows-x86_64-gpu-nv-output/test_Ray_output.txt windows-x86_64-gpu-amd-output/test_Ray_output.txt windows-x86_64-gpu-uhd-output/test_Ray_output.txt windows-x86_64-gpu-arc-output/test_Ray_output.txt linux-x86_64-cpu-output/test_Ray_output.txt linux-x86_64-gpu-nv-output/test_Ray_output.txt macos-arm64-cpu-output/test_Ray_output.txt macos-arm64-gpu-m4-output/test_Ray_output.txt macos-x86_64-cpu-output/test_Ray_output.txt shell: bash \ No newline at end of file diff --git a/tests/test_shading.cpp b/tests/test_shading.cpp index d8e16ee2..8fe35049 100644 --- a/tests/test_shading.cpp +++ b/tests/test_shading.cpp @@ -1470,7 +1470,7 @@ void test_complex_mat5_adaptive(const char *arch_list[], std::string_view prefer const int MinSampleCount = 8; const int MaxSampleCount = 18; const float VarianceThreshold = 0.004f; - const int PixThres = 2065; + const int PixThres = 2070; Ray::principled_mat_desc_t metal_mat_desc; metal_mat_desc.base_texture = Ray::TextureHandle{0}; @@ -1772,7 +1772,7 @@ void test_complex_mat6_nlm_filter(const char *arch_list[], std::string_view pref void test_complex_mat6_unet_filter(const char *arch_list[], std::string_view preferred_device) { const int SampleCount = 23; - const int PixThres = 900; + const int PixThres = 905; Ray::principled_mat_desc_t olive_mat_desc; olive_mat_desc.base_color[0] = 0.836164f; @@ -1857,7 +1857,7 @@ void test_complex_mat6_spot_light(const char *arch_list[], std::string_view pref void test_complex_mat6_dir_light(const char *arch_list[], std::string_view preferred_device) { const int SampleCount = 86; const double MinPSNR = 18.0; - const int PixThres = 9450; + const int PixThres = 9455; Ray::principled_mat_desc_t olive_mat_desc; olive_mat_desc.base_color[0] = 0.836164f;