Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Readd CUDA in Windos #59

Merged
merged 16 commits into from
Jun 27, 2024
59 changes: 45 additions & 14 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ jobs:
cfg:
- { CUDA: '0', ONEAPI: '0', MSVC: true }
- { CUDA: '0', ONEAPI: '0', MSVC: false }
- { CUDA: '11.0', MSVC: true }

runs-on: ${{ matrix.os }}

Expand All @@ -204,6 +205,12 @@ jobs:
if: matrix.cfg.MSVC == false
with:
args: install mingw
- name: Install CUDA Toolkit
if: matrix.cfg.CUDA == '11.0'
shell: pwsh
run: |
Set-ExecutionPolicy unrestricted
& '.github\\install-cuda.ps1' -Version '11.0'
- uses: ilammy/msvc-dev-cmd@v1
if: matrix.cfg.MSVC == true
- name: Create build directory
Expand All @@ -222,6 +229,14 @@ jobs:
run: |
cd build
cmake -G "NMake Makefiles" ..
- name: Run CMake configure
if: matrix.cfg.CUDA != '0'
shell: pwsh
run: |
cd build
ls
dir "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.0"
cmake -G "NMake Makefiles" -DFIRESTARTER_BUILD_TYPE="FIRESTARTER_CUDA" -DCUDAToolkit_ROOT="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.0" ..
- name: Build
shell: pwsh
run: |
Expand Down Expand Up @@ -249,6 +264,13 @@ jobs:
path: |
build\src\FIRESTARTER.exe
build\src\libhwloc-15.dll
- uses: actions/upload-artifact@v2
if: matrix.cfg.CUDA != '0'
with:
name: FIRESTARTER_CUDA_${{ matrix.cfg.CUDA }}-windows
path: |
build\src\FIRESTARTER_CUDA.exe
build\src\libhwloc-15.dll
build-macos:
strategy:
fail-fast: false
Expand Down Expand Up @@ -289,9 +311,9 @@ jobs:
name: FIRESTARTER-macOS_12
path: build/src/FIRESTARTER
- uses: actions/upload-artifact@v4
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-13'
with:
name: FIRESTARTER-macOS_11
name: FIRESTARTER-macOS_13
path: build/src/FIRESTARTER
create-download:
name: Create download for Website
Expand Down Expand Up @@ -374,18 +396,6 @@ jobs:
mv FIRESTARTER/FIRESTARTER_ONEAPI FIRESTARTER_ONEAPI_2023.2.0
rm -rf FIRESTARTER
chmod +x FIRESTARTER_ONEAPI_2023.2.0
# OSX 11.0
#- name: Retrieve FIRESTARTER-macOS_11.0
# uses: actions/download-artifact@v4
# with:
# name: FIRESTARTER-macOS_11.0
# path: FIRESTARTER
#- name: Move binary to right directory
# run: |
# mv FIRESTARTER/FIRESTARTER ../FIRESTARTER-macOS_11.0
# rm -rf FIRESTARTER
# chmod +x ../FIRESTARTER-macOS_11.0
# OSX 10.15
- name: Retrieve FIRESTARTER-macOS_12
uses: actions/download-artifact@v4
with:
Expand All @@ -396,6 +406,16 @@ jobs:
mv FIRESTARTER/FIRESTARTER FIRESTARTER-macOS_12
rm -rf FIRESTARTER
chmod +x FIRESTARTER-macOS_12
- name: Retrieve FIRESTARTER-macOS_13
uses: actions/download-artifact@v4
with:
name: FIRESTARTER-macOS_13
path: FIRESTARTER
- name: Move binary to right directory
run: |
mv FIRESTARTER/FIRESTARTER FIRESTARTER-macOS_13
rm -rf FIRESTARTER
chmod +x FIRESTARTER-macOS_13
# Windows
- name: Retrieve FIRESTARTER-windows
uses: actions/download-artifact@v4
Expand All @@ -407,6 +427,17 @@ jobs:
mv FIRESTARTER/FIRESTARTER.exe FIRESTARTER-windows.exe
mv FIRESTARTER/libhwloc-15.dll libhwloc-15.dll
rm -rf FIRESTARTER
# Windows CUDA
- name: Retrieve FIRESTARTER_CUDA_11.0-windows
uses: actions/download-artifact@v2
with:
name: FIRESTARTER_CUDA_11.0-windows
path: FIRESTARTER
- name: Move binary to right directory
run: |
mv FIRESTARTER/FIRESTARTER_CUDA.exe FIRESTARTER_CUDA_11.0-windows.exe
mv FIRESTARTER/libhwloc-15.dll libhwloc-15.dll
rm -rf FIRESTARTER
# Create tar.gz
- name: Copy CHANGELOG, README and LICENSE
run: |
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ if ("${FIRESTARTER_BUILD_TYPE}" STREQUAL "FIRESTARTER_CUDA")
Threads::Threads
CUDA::cuda_driver
CUDA::cudart
CUDA::cufft
CUDA::curand
CUDA::cublas
)
Expand Down
Loading