Skip to content

Commit

Permalink
Added Vulkan SDK installation to msys2 CI script. Reduced frame time …
Browse files Browse the repository at this point in the history
…in unit tests.
  • Loading branch information
chrismile committed Feb 14, 2022
1 parent 12cc29e commit f0011a3
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/build-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,14 @@ jobs:
path: sgl-repo
submodules: true

- name: Install Vulkan SDK
shell: bash
run: |
choco install vulkan-sdk
- name: Configure CMake (sgl)
run: |
export VULKAN_SDK="C:/VulkanSDK/$(ls C:/VulkanSDK)"
cmake "${{env.sgl_REPO_DIR}}" -B "${{env.sgl_REPO_DIR}}/build" -G "MSYS Makefiles" \
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX="${{env.sgl_DIR}}"
Expand All @@ -73,6 +79,7 @@ jobs:

- name: Configure CMake (CloudRendering)
run: |
export VULKAN_SDK="C:/VulkanSDK/$(ls C:/VulkanSDK)"
cmake -B "${{github.workspace}}/build" -G "MSYS Makefiles" -DPython3_FIND_REGISTRY=NEVER \
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -Dsgl_DIR="${{env.sgl_DIR}}/lib/cmake/sgl"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
strategy:
fail-fast: false
matrix:
use-vulkan: [ true, false ]
os: [ ubuntu-18.04, ubuntu-20.04 ]

runs-on: ${{ matrix.os }}
Expand Down
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,6 @@ if (${SUPPORT_OPTIX})
endif()
endif()

find_package(Vulkan REQUIRED)
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.21.0")
target_link_libraries(CloudRendering PUBLIC Vulkan::Headers)
endif()

if((${CMAKE_GENERATOR} STREQUAL "MinGW Makefiles") OR (${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles"))
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mwindows")
target_link_libraries(CloudRendering PUBLIC mingw32)
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ export USE_VULKAN=1
python setup.py install
```

The PyTorch Vulkan backend is planned to also be supported once the PyTorch Vulkan code base has sufficiently matured.
It is planned to also add support for the PyTorch Vulkan backend once the PyTorch Vulkan code base has sufficiently
matured. As of 2022-02-14, there are still some problems building PyTorch with Vulkan support on x86_64 Linux.


## How to add new data sets
Expand Down
6 changes: 3 additions & 3 deletions test/TestVolumetricPathTracing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class VolumetricPathTracingTest : public ::testing::Test {
+ "_1.png",
frameData1, width, height);
}
ASSERT_NEAR(mean0[c], mean1[c], 1e-3);
ASSERT_NEAR(mean0[c], mean1[c], 2e-3);
}
}

Expand All @@ -110,8 +110,8 @@ class VolumetricPathTracingTest : public ::testing::Test {
}

sgl::vk::Renderer* renderer = nullptr;
int numSamples = 128;
int renderingResolution = 256;
int numSamples = 64;
int renderingResolution = 128;
std::shared_ptr<VolumetricPathTracingTestRenderer> vptRenderer0;
std::shared_ptr<VolumetricPathTracingTestRenderer> vptRenderer1;
};
Expand Down

0 comments on commit f0011a3

Please sign in to comment.