diff --git a/.github/workflows/testUbuntu.yml b/.github/workflows/testUbuntu.yml index ac9cd49e..b7894fa7 100644 --- 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 index 4559f54c..b7523a6a 100644 --- 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 index 9854d3c0..e7b81a33 100644 --- a/.github/workflows/testWindows.yml +++ b/.github/workflows/testWindows.yml @@ -3,7 +3,7 @@ name: testWindows on: [push, pull_request] env: - BUILD_TYPE: Release + BUILD_TYPE: Debug jobs: build: @@ -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: Prepare Vulkan SDK # uses: humbletim/setup-vulkan-sdk@v1.2.0 @@ -62,11 +59,15 @@ jobs: 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}} + cmake --build ${{github.workspace}}/build --target rayx --config ${{env.BUILD_TYPE}} + + # - name: Test + # working-directory: ${{github.workspace}}/build/bin/release + # run: ./rayx-core-tst -x - - name: Test - working-directory: ${{github.workspace}}/build/bin/release - run: ./rayx-core-tst -x + - name: Run + working-directory: ${{github.workspace}}/build/bin/debug + run: ./rayx -m 6 -x -i "${{github.workspace}}/Scripts/benchmark-inputs/ReflectionZonePlateDefault200Toroid.rml" - name: CPack run: | diff --git a/Intern/rayx-core/src/Shader/Throw.h b/Intern/rayx-core/src/Shader/Throw.h index 20ae06aa..aec05b27 100644 --- 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("Error occurred while executing shader: %s\n", string); assert(false) // #endif diff --git a/Intern/rayx-core/tests/setupTests.h b/Intern/rayx-core/tests/setupTests.h index 7d0df4a7..6bf554d1 100644 --- 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::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 index 57a2e6bd..394a3fb0 100644 --- 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(); }