Skip to content

Commit 1e2ae60

Browse files
sergcppsergcpp
committed
WIP: Use nvidia device in tests
1 parent 629b70e commit 1e2ae60

File tree

4 files changed

+88
-88
lines changed

4 files changed

+88
-88
lines changed

‎.gitea/workflows/ci.yml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -107,29 +107,29 @@ jobs:
107107
with:
108108
name: windows-x86_64-cpu-output
109109
path: windows-x86_64-cpu-output/
110-
# test-windows-x86_64-gpu-nv:
111-
# runs-on: [ windows, x86_64, nv ]
112-
# needs:
113-
# - build-windows-x86_64-rel
114-
# steps:
115-
# - name: Checkout Workflows
116-
# uses: actions/checkout@v4
117-
# with:
118-
# sparse-checkout: .gitea
119-
# - name: Re-initialize repository
120-
# uses: ./.gitea/actions/checkout
121-
# - name: Run Tests
122-
# uses: ./.gitea/actions/test
123-
# with:
124-
# bin-dir: "windows-x86_64"
125-
# out-dir: "windows-x86_64-gpu-nv-output"
126-
# test-args: "--device NV --nocpu"
127-
# - name: Upload artifacts
128-
# uses: actions/upload-artifact@v3
129-
# if: always()
130-
# with:
131-
# name: windows-x86_64-gpu-nv-output
132-
# path: windows-x86_64-gpu-nv-output/
110+
test-windows-x86_64-gpu-nv:
111+
runs-on: [ windows, x86_64, nv ]
112+
needs:
113+
- build-windows-x86_64-rel
114+
steps:
115+
- name: Checkout Workflows
116+
uses: actions/checkout@v4
117+
with:
118+
sparse-checkout: .gitea
119+
- name: Re-initialize repository
120+
uses: ./.gitea/actions/checkout
121+
- name: Run Tests
122+
uses: ./.gitea/actions/test
123+
with:
124+
bin-dir: "windows-x86_64"
125+
out-dir: "windows-x86_64-gpu-nv-output"
126+
test-args: "--device NV --nocpu"
127+
- name: Upload artifacts
128+
uses: actions/upload-artifact@v3
129+
if: always()
130+
with:
131+
name: windows-x86_64-gpu-nv-output
132+
path: windows-x86_64-gpu-nv-output/
133133
test-windows-x86_64-gpu-amd:
134134
runs-on: [ windows, x86_64, amd ]
135135
needs:
@@ -386,7 +386,7 @@ jobs:
386386
path: macos-x86_64-cpu-output/
387387
analyze-output:
388388
runs-on: [ linux ]
389-
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 ]
389+
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 ]
390390
if: always()
391391
steps:
392392
- name: Checkout Workflows
@@ -397,10 +397,10 @@ jobs:
397397
with:
398398
name: windows-x86_64-cpu-output
399399
path: windows-x86_64-cpu-output/
400-
# - uses: actions/download-artifact@v3
401-
# with:
402-
# name: windows-x86_64-gpu-nv-output
403-
# path: windows-x86_64-gpu-nv-output/
400+
- uses: actions/download-artifact@v3
401+
with:
402+
name: windows-x86_64-gpu-nv-output
403+
path: windows-x86_64-gpu-nv-output/
404404
- uses: actions/download-artifact@v3
405405
with:
406406
name: windows-x86_64-gpu-amd-output
@@ -447,5 +447,5 @@ jobs:
447447
path: macos-x86_64-cpu-output/
448448
- name: Analyze Output
449449
run: |
450-
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
450+
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
451451
shell: bash

‎.gitea/workflows/release.yml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -303,29 +303,29 @@ jobs:
303303
with:
304304
name: windows-x86_64-cpu-output
305305
path: windows-x86_64-cpu-output/
306-
# test-windows-x86_64-gpu-nv:
307-
# runs-on: [ windows, x86_64, nv ]
308-
# needs:
309-
# - build-windows-x86_64-rel
310-
# steps:
311-
# - name: Checkout Workflows
312-
# uses: actions/checkout@v4
313-
# with:
314-
# sparse-checkout: .gitea
315-
# - name: Re-initialize repository
316-
# uses: ./.gitea/actions/checkout
317-
# - name: Run Tests
318-
# uses: ./.gitea/actions/test
319-
# with:
320-
# bin-dir: "windows-x86_64"
321-
# out-dir: "windows-x86_64-gpu-nv-output"
322-
# test-args: "--full --device NV --nocpu"
323-
# - name: Upload artifacts
324-
# uses: actions/upload-artifact@v3
325-
# if: always()
326-
# with:
327-
# name: windows-x86_64-gpu-nv-output
328-
# path: windows-x86_64-gpu-nv-output/
306+
test-windows-x86_64-gpu-nv:
307+
runs-on: [ windows, x86_64, nv ]
308+
needs:
309+
- build-windows-x86_64-rel
310+
steps:
311+
- name: Checkout Workflows
312+
uses: actions/checkout@v4
313+
with:
314+
sparse-checkout: .gitea
315+
- name: Re-initialize repository
316+
uses: ./.gitea/actions/checkout
317+
- name: Run Tests
318+
uses: ./.gitea/actions/test
319+
with:
320+
bin-dir: "windows-x86_64"
321+
out-dir: "windows-x86_64-gpu-nv-output"
322+
test-args: "--full --device NV --nocpu"
323+
- name: Upload artifacts
324+
uses: actions/upload-artifact@v3
325+
if: always()
326+
with:
327+
name: windows-x86_64-gpu-nv-output
328+
path: windows-x86_64-gpu-nv-output/
329329
test-windows-x86_64-gpu-amd:
330330
runs-on: [ windows, x86_64, amd ]
331331
needs:
@@ -820,7 +820,7 @@ jobs:
820820
# path: windows-arm64-gpu-perf-output/
821821
analyze-output:
822822
runs-on: [ linux ]
823-
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 ]
823+
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 ]
824824
if: always()
825825
steps:
826826
- name: Checkout Workflows
@@ -831,10 +831,10 @@ jobs:
831831
with:
832832
name: windows-x86_64-cpu-output
833833
path: windows-x86_64-cpu-output/
834-
# - uses: actions/download-artifact@v3
835-
# with:
836-
# name: windows-x86_64-gpu-nv-output
837-
# path: windows-x86_64-gpu-nv-output/
834+
- uses: actions/download-artifact@v3
835+
with:
836+
name: windows-x86_64-gpu-nv-output
837+
path: windows-x86_64-gpu-nv-output/
838838
- uses: actions/download-artifact@v3
839839
with:
840840
name: windows-x86_64-gpu-amd-output
@@ -921,5 +921,5 @@ jobs:
921921
# path: windows-arm64-gpu-perf-output/
922922
- name: Analyze Output
923923
run: |
924-
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
924+
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
925925
shell: bash

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -107,29 +107,29 @@ jobs:
107107
with:
108108
name: windows-x86_64-cpu-output
109109
path: windows-x86_64-cpu-output/
110-
# test-windows-x86_64-gpu-nv:
111-
# runs-on: [ windows, x86_64, nv ]
112-
# needs:
113-
# - build-windows-x86_64-rel
114-
# steps:
115-
# - name: Checkout Workflows
116-
# uses: actions/checkout@v4
117-
# with:
118-
# sparse-checkout: .github
119-
# - name: Re-initialize repository
120-
# uses: ./.github/actions/checkout
121-
# - name: Run Tests
122-
# uses: ./.github/actions/test
123-
# with:
124-
# bin-dir: "windows-x86_64"
125-
# out-dir: "windows-x86_64-gpu-nv-output"
126-
# test-args: "--device NV --nocpu"
127-
# - name: Upload artifacts
128-
# uses: actions/upload-artifact@v4
129-
# if: always()
130-
# with:
131-
# name: windows-x86_64-gpu-nv-output
132-
# path: windows-x86_64-gpu-nv-output/
110+
test-windows-x86_64-gpu-nv:
111+
runs-on: [ windows, x86_64, nv ]
112+
needs:
113+
- build-windows-x86_64-rel
114+
steps:
115+
- name: Checkout Workflows
116+
uses: actions/checkout@v4
117+
with:
118+
sparse-checkout: .github
119+
- name: Re-initialize repository
120+
uses: ./.github/actions/checkout
121+
- name: Run Tests
122+
uses: ./.github/actions/test
123+
with:
124+
bin-dir: "windows-x86_64"
125+
out-dir: "windows-x86_64-gpu-nv-output"
126+
test-args: "--device NV --nocpu"
127+
- name: Upload artifacts
128+
uses: actions/upload-artifact@v4
129+
if: always()
130+
with:
131+
name: windows-x86_64-gpu-nv-output
132+
path: windows-x86_64-gpu-nv-output/
133133
test-windows-x86_64-gpu-amd:
134134
runs-on: [ windows, x86_64, amd ]
135135
needs:
@@ -386,7 +386,7 @@ jobs:
386386
path: macos-x86_64-cpu-output/
387387
analyze-output:
388388
runs-on: [ linux ]
389-
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 ]
389+
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 ]
390390
if: always()
391391
steps:
392392
- name: Checkout Workflows
@@ -398,10 +398,10 @@ jobs:
398398
with:
399399
name: windows-x86_64-cpu-output
400400
path: windows-x86_64-cpu-output/
401-
# - uses: actions/download-artifact@v4
402-
# with:
403-
# name: windows-x86_64-gpu-nv-output
404-
# path: windows-x86_64-gpu-nv-output/
401+
- uses: actions/download-artifact@v4
402+
with:
403+
name: windows-x86_64-gpu-nv-output
404+
path: windows-x86_64-gpu-nv-output/
405405
- uses: actions/download-artifact@v4
406406
with:
407407
name: windows-x86_64-gpu-amd-output
@@ -448,5 +448,5 @@ jobs:
448448
path: macos-x86_64-cpu-output/
449449
- name: Analyze Output
450450
run: |
451-
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
451+
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
452452
shell: bash

‎tests/test_shading.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ void test_complex_mat5_adaptive(const char *arch_list[], std::string_view prefer
14701470
const int MinSampleCount = 8;
14711471
const int MaxSampleCount = 18;
14721472
const float VarianceThreshold = 0.004f;
1473-
const int PixThres = 2065;
1473+
const int PixThres = 2070;
14741474

14751475
Ray::principled_mat_desc_t metal_mat_desc;
14761476
metal_mat_desc.base_texture = Ray::TextureHandle{0};

0 commit comments

Comments
 (0)