...

hz-b · Aug 1, 2024 · 0190a45 · 0190a45
1 parent 7c8b60a
commit 0190a45
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 45 deletions.
diff --git a/.github/workflows/testUbuntu.yml b/.github/workflows/testUbuntu.yml
@@ -11,11 +11,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
-      - name: Update all submodules
-        run: |
-          git submodule sync
-          git submodule update --init --recursive
+        with:
+          submodules: 'recursive'
 
       - name: Make some space
         run: |

diff --git a/.github/workflows/testUbuntuClang.yml b/.github/workflows/testUbuntuClang.yml
@@ -10,12 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Update all submodules
-        run: |
-          git submodule sync
-          git submodule update --init --recursive
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/testWindows.yml b/.github/workflows/testWindows.yml
@@ -3,36 +3,33 @@ name: testWindows
 on: [push, pull_request]
 
 env:
-  BUILD_TYPE: Release
+  BUILD_TYPE: Debug
 
 jobs:
   build:
     runs-on: windows-latest
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
 
-      - name: Update all submodules
-        run: |
-          git submodule sync
-          git submodule update --init --recursive
-
-      # - name: Prepare Vulkan SDK
-      #   uses: humbletim/[email protected]
-      #   with:
-      #     vulkan-query-version: 1.3.275.0
-      #     vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Cross, SPIRV-Tools, Glslang 
-      #     vulkan-use-cache: true
-      #
-      # - name: Download glslangValidator
-      #   run: curl -L -o glslang.zip https://github.com/KhronosGroup/glslang/releases/download/main-tot/glslang-master-windows-Release.zip
-      #
-      # - name: Extract glslangValidator
-      #   shell: powershell
-      #   run: Expand-Archive -Path glslang.zip -DestinationPath ${{github.workspace}}/glslang
-      #
-      # - name: Add glslangValidator to PATH
-      #   run: echo "${{github.workspace}}/glslang/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - name: Prepare Vulkan SDK
+        uses: humbletim/[email protected]
+        with:
+          vulkan-query-version: 1.3.275.0
+          vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Cross, SPIRV-Tools, Glslang 
+          vulkan-use-cache: true
+
+      - name: Download glslangValidator
+        run: curl -L -o glslang.zip https://github.com/KhronosGroup/glslang/releases/download/main-tot/glslang-master-windows-Release.zip
+
+      - name: Extract glslangValidator
+        shell: powershell
+        run: Expand-Archive -Path glslang.zip -DestinationPath ${{github.workspace}}/glslang
+
+      - name: Add glslangValidator to PATH
+        run: echo "${{github.workspace}}/glslang/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
       - name: Install boost
         uses: MarkusJx/[email protected]
@@ -48,25 +45,29 @@ jobs:
           echo "${{github.workspace}}/boost" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           echo "${{github.workspace}}/boost/boost" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-      - name: Setup CUDA Toolkit
-        id: cuda-toolkit
-        shell: pwsh
-        run: .\Scripts\setup-cuda.ps1
-        env:
-            INPUT_CUDA_VERSION: 12.5.1
+      # - name: Setup CUDA Toolkit
+      #   id: cuda-toolkit
+      #   shell: pwsh
+      #   run: .\Scripts\setup-cuda.ps1
+      #   env:
+      #       INPUT_CUDA_VERSION: 12.5.1
 
       - name: Configure CMake
-        run: cmake -B ${{github.workspace}}/build -DWERROR=YES -DRAYX_REQUIRES_CUDA=ON
+        run: cmake -B ${{github.workspace}}/build -DWERROR=YES -DRAYX_ENABLE_CUDA=OFF
 
       - name: Build
         run: |
           type "${{github.workspace}}/build/CMakeCache.txt"
           echo "D:\a\rayx\rayx\vcpkg\installed\x64-windows\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
-      - name: Test
+      # - name: Test
+      #   working-directory: ${{github.workspace}}/build/bin/release
+      #   run: ./rayx-core-tst -x
+
+      - name: Run
         working-directory: ${{github.workspace}}/build/bin/release
-        run: ./rayx-core-tst -x
+        run: ./rayx -m 6 -x -i "${{github.workspace}}Scripts/benchmark-inputs/ReflectionZonePlateDefault200Toroid.rml"; Dir -Recurse C:\ProgramData\Microsoft\Windows\WER\ReportQueue | Get-Childitem
 
       - name: CPack
         run: |

diff --git a/Intern/rayx-core/src/Shader/Throw.h b/Intern/rayx-core/src/Shader/Throw.h
@@ -6,5 +6,5 @@
 // TODO(Sven): rethink error handling. just instantly terminate with RAYX_ERR or use recordFinalEvent?
 // #define _throw(string) recordFinalEvent(_ray, ETYPE_FATAL_ERROR)
 // #define _throw(string) RAYX_ERR << string
-#define _throw(string) assert(false)
+#define _throw(string) printf("%s\n", string); assert(false)
 // #endif
diff --git a/Intern/rayx-core/tests/setupTests.h b/Intern/rayx-core/tests/setupTests.h
@@ -152,6 +152,7 @@ inline void add_failure() { ADD_FAILURE(); }
 class TestSuite : public testing::Test {
   protected:
     static void SetUpTestSuite() {
+        RAYX_LOG << "SetUpTestSuite";
         RAYX::error_fn = add_failure;
 
         bool cpu = false;
@@ -163,13 +164,16 @@ class TestSuite : public testing::Test {
         }
 
         // Choose Hardware
+        RAYX_LOG << "SetUpTestSuite create tracer";
+        RAYX_LOG << "cpu: " << cpu;
         using DeviceType = RAYX::DeviceConfig::DeviceType;
         const auto deviceType = cpu ? DeviceType::Cpu : DeviceType::Gpu;
         tracer = std::make_unique<RAYX::Tracer>(RAYX::DeviceConfig(deviceType).enableBestDevice());
+        RAYX_LOG << "SetUpTestSuite created tracer";
     }
 
     // called before every test invocation.
-    void SetUp() override { RAYX::fixSeed(RAYX::FIXED_SEED); }
+    void SetUp() override { RAYX_LOG << "START"; RAYX::fixSeed(RAYX::FIXED_SEED); }
 
     static void TearDownTestSuite() { tracer = nullptr; }
 };

diff --git a/Intern/rayx/src/CommandParser.cpp b/Intern/rayx/src/CommandParser.cpp
@@ -34,7 +34,7 @@ CommandParser::CommandParser(int _argc, char* const* _argv) : m_cli11{std::make_
     } catch (const CLI::ParseError& e) {
         m_cli11_return = m_cli11->exit(e);
         if ((e.get_name() == "CallForHelp") || (e.get_name() == "CallForAllHelp"))
-            exit(1);
+            RAYX_ERR << "CLI ERROR: unknown error";
         else
             RAYX_D_ERR << "CLI ERROR" << m_cli11_return << " " << e.get_name();
     }