Skip to content

Commit 383d676

Browse files
committed
Update version to 1.0.0
1 parent acfdb58 commit 383d676

File tree

3 files changed

+24
-33
lines changed

3 files changed

+24
-33
lines changed

.github/workflows/releaseDeploy.yml

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- os: windows-latest
15+
- os: windows-2025
1616
build-type: Release
1717
- os: ubuntu-24.04
1818
build-type: Release
@@ -28,54 +28,42 @@ jobs:
2828
2929
# Prepare environment (Vulkan SDK, dependencies) based on OS
3030
- name: Prepare environment
31-
uses: humbletim/[email protected].0
31+
uses: humbletim/[email protected].1
3232
with:
33-
vulkan-query-version: 1.3.204.0
34-
vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
33+
vulkan-query-version: 1.4.304.1
34+
vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
3535
vulkan-use-cache: true
3636

3737
- name: Install dependencies (Windows)
38-
if: matrix.os == 'windows-latest'
38+
if: matrix.os == 'windows-2025'
3939
run: |
4040
vcpkg install hdf5 --triplet x64-windows
4141
vcpkg integrate install
4242
echo "$env:VCPKG_INSTALLATION_ROOT\installed\x64-windows\bin" >> $GITHUB_PATH
4343
shell: powershell
4444

45-
- name: Install boost (Windows)
46-
if: matrix.os == 'windows-latest'
47-
uses: MarkusJx/[email protected]
48-
id: install-boost
49-
with:
50-
boost_version: 1.84.0
51-
boost_install_dir: ${{github.workspace}}/boost
52-
platform_version: 2019
53-
toolset: msvc
54-
55-
- name: Add Boost to PATH (Windows)
56-
if: matrix.os == 'windows-latest'
57-
run: |
58-
echo "${{github.workspace}}/boost" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
59-
echo "${{github.workspace}}/boost/boost" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
45+
- name: Install NSIS (Windows)
46+
if: matrix.os == 'windows-2025'
47+
run: choco install nsis -y
6048

6149
- name: Setup CUDA Toolkit
62-
if: matrix.os == 'windows-latest'
50+
if: matrix.os == 'windows-2025'
6351
id: cuda-toolkit
6452
shell: pwsh
6553
run: .\Scripts\setup-cuda.ps1
6654
env:
67-
INPUT_CUDA_VERSION: 12.5.1
55+
INPUT_CUDA_VERSION: 12.9.1
6856

6957
- name: Configure CMake (Windows)
70-
if: matrix.os == 'windows-latest'
71-
run: cmake -B ${{github.workspace}}/build -DRAYX_WERROR=ON -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DRAYX_REQUIRE_CUDA=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
58+
if: matrix.os == 'windows-2025'
59+
run: cmake -B ${{github.workspace}}/build -DRAYX_WERROR=ON -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DRAYX_REQUIRE_CUDA=ON -DRAYX_REQUIRE_OPENMP=ON -DRAYX_REQUIRE_CUDA=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
7260

7361
# Linux-specific build steps
7462
- name: Install dependencies (Ubuntu)
7563
if: matrix.os == 'ubuntu-24.04'
7664
run: |
7765
sudo apt update --yes
78-
sudo apt install --yes xorg-dev cmake libgtk-3-dev libdbus-1-dev libhdf5-dev libboost-dev
66+
sudo apt install --yes xorg-dev cmake libgtk-3-dev libdbus-1-dev libhdf5-dev
7967
8068
- name: Install Cuda (Ubuntu)
8169
if: matrix.os == 'ubuntu-24.04'
@@ -86,7 +74,7 @@ jobs:
8674

8775
- name: Configure CMake (Ubuntu)
8876
if: matrix.os == 'ubuntu-24.04'
89-
run: cmake -B ${{github.workspace}}/build -DRAYX_WERROR=ON -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DRAYX_REQUIRE_CUDA=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
77+
run: cmake -B ${{github.workspace}}/build -DRAYX_WERROR=ON -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DRAYX_REQUIRE_CUDA=ON -DRAYX_REQUIRE_OPENMP=ON -DRAYX_REQUIRE_CUDA=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
9078

9179
# Build the project
9280
- name: Build
@@ -98,12 +86,12 @@ jobs:
9886

9987
# Generate Windows artifacts (ZIP and NSIS installer)
10088
- name: CPack (Windows - ZIP)
101-
if: matrix.os == 'windows-latest'
89+
if: matrix.os == 'windows-2025'
10290
working-directory: ${{github.workspace}}/build
103-
run: cpack -G ZIP
91+
run: cpack -G ZIP
10492

10593
- name: CPack (Windows - NSIS Installer)
106-
if: matrix.os == 'windows-latest'
94+
if: matrix.os == 'windows-2025'
10795
working-directory: ${{github.workspace}}/build
10896
run: cpack -G NSIS
10997

@@ -125,7 +113,7 @@ jobs:
125113

126114
# Upload artifacts (Windows)
127115
- name: Upload build artifacts (Windows)
128-
if: matrix.os == 'windows-latest'
116+
if: matrix.os == 'windows-2025'
129117
uses: actions/upload-artifact@v4
130118
with:
131119
name: windows-artifacts
@@ -154,7 +142,6 @@ jobs:
154142
run: |
155143
git archive HEAD --format=zip --output=${{github.workspace}}/build/RAYX-source-v${{env.version}}.zip
156144
157-
158145
release:
159146
name: Create Release
160147
needs: build-and-release

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@
5757

5858
## Probably coming soon
5959

60-
* Mac support including multithreaded tracing on CPU using OpenMP (x86 and arm)
60+
* Mac support including multithreaded tracing on CPU using OpenMP (arm, x86)
6161
* Nix flake for reproducable dependency handling to make developing and building rayx more accessible
6262
* Multi layer foil

Scripts/shell.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ pkgs.mkShell {
88
buildInputs = with pkgs; [
99

1010
# dev tools
11-
python3
1211
clang # for clang-format
12+
python313
13+
python313Packages.pip
14+
python313Packages.numpy
15+
python313Packages.matplotlib
16+
python313Packages.h5py
1317

1418
# build tools
1519
pkg-config

0 commit comments

Comments
 (0)