Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/action-scripts/install-cuda-windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ $CUDA_KNOWN_URLS = @{
"12.6.1" = "https://developer.download.nvidia.com/compute/cuda/12.6.1/network_installers/cuda_12.6.1_windows_network.exe";
"12.6.2" = "https://developer.download.nvidia.com/compute/cuda/12.6.2/network_installers/cuda_12.6.2_windows_network.exe";
"13.0.0" = "https://developer.download.nvidia.com/compute/cuda/13.0.0/network_installers/cuda_13.0.0_windows_network.exe";
"13.0.2" = "https://developer.download.nvidia.com/compute/cuda/13.0.2/network_installers/cuda_13.0.2_windows_network.exe";
}

# @todo - change this to be based on _MSC_VER intead, or invert it to be CUDA keyed instead?
Expand Down
37 changes: 21 additions & 16 deletions .github/workflows/Windows.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
name: Windows

#on:
# workflow_dispatch:

on:
workflow_dispatch:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:
Expand All @@ -15,35 +21,30 @@ jobs:
cuda: "12.6.2"
visual-studio: "Visual Studio 17 2022"
shell: "powershell"
cmake-platform-flag: "-A x64"
config: Release
build_flags:
- os: windows-2022
cuda: "13.0.0"
visual-studio: "Visual Studio 17 2022"
shell: "powershell"
cmake-platform-flag: "-A x64"
config: Release
build_flags:
- os: windows-2025
cuda: "12.6.2"
visual-studio: "Visual Studio 17 2022"
shell: "powershell"
cmake-platform-flag: "-A x64"
config: Release
build_flags:
- os: windows-2025
cuda: "13.0.0"
visual-studio: "Visual Studio 17 2022"
shell: "powershell"
cmake-platform-flag: "-A x64"
config: Release
build_flags:
- os: windows-2025
cuda: "none"
visual-studio: "Visual Studio 17 2022"
shell: "powershell"
cmake-platform-flag: "-A x64"
config: Release
build_flags: "-DBARNEY_BACKEND_EMBREE=ON -DBARNEY_BACKEND_CUDA=OFF -DBARNEY_BACKEND_OPTIX=OFF"

Expand Down Expand Up @@ -77,34 +78,38 @@ jobs:
repository: "KhronosGroup/ANARI-SDK"
path: ${{github.workspace}}/anari_sdk

- name: create shared install dir
run: |
mkdir ${{github.workspace}}\install

- name: CMake Configure ANARI-SDK
run: |
mkdir ${{github.workspace}}/anari_sdk/build
cd ${{github.workspace}}/anari_sdk/build
cmake .. -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DBUILD_HELIDE_DEVICE=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=${{matrix.config}}
mkdir ${{github.workspace}}\anari_sdk\build
cd ${{github.workspace}}\anari_sdk\build
cmake -DCMAKE_BUILD_TYPE=${{matrix.config}} -A x64 -G "${{ matrix.visual-studio }}" .. -DCMAKE_INSTALL_PREFIX=${{github.workspace}}\install -DBUILD_HELIDE_DEVICE=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF

- name: build ANARI-SDK
run: |
cd ${{github.workspace}}/anari_sdk/build
cd ${{github.workspace}}\anari_sdk\build
cmake --build . --config ${{ matrix.config }}

- name: install ANARI-SDK
run: |
cd ${{github.workspace}}/anari_sdk/build
cd ${{github.workspace}}\anari_sdk\build
cmake --install . --config ${{ matrix.config }}

- name: CMake Configure barney
run: |
mkdir ${{github.workspace}}/build
cd ${{github.workspace}}/build
cmake .. -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install ${{ matrix.build_flags }} -DCMAKE_BUILD_TYPE=${{matrix.config}}
mkdir ${{github.workspace}}\build
cd ${{github.workspace}}\build
cmake -A x64 -G "${{ matrix.visual-studio }}" .. -DCMAKE_INSTALL_PREFIX=${{github.workspace}}\install ${{ matrix.build_flags }} -DCMAKE_BUILD_TYPE=${{matrix.config}}

- name: build barney
run: |
cd ${{github.workspace}}/build
cd ${{github.workspace}}\build
cmake --build . --config ${{ matrix.config }}

- name: install barney
run: |
cd ${{github.workspace}}/build
cd ${{github.workspace}}\build
cmake --install . --config ${{ matrix.config }}
7 changes: 7 additions & 0 deletions anari/Sampler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ namespace barney_device {
width,
height,
input->dataAs<float>());
} else if (input->elementType() == ANARI_UFIXED8_VEC4) {
return bnTextureData2DCreate(context,
slot,
BN_UFIXED8_RGBA,
width,
height,
input->data());
} else {
std::vector<uint32_t> texels;
objectToReportErrorWith->reportMessage
Expand Down