Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
faust
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
GitLab upgrade completed. Current version is 17.11.4.
Show more breadcrumbs
faust group
faust
Commits
010223b1
Commit
010223b1
authored
2 years ago
by
hhakim
Browse files
Options
Downloads
Patches
Plain Diff
Enable cuda12.1 for windows packages.
parent
ef1876c0
No related branches found
No related tags found
No related merge requests found
Pipeline
#834171
skipped
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+19
-4
19 additions, 4 deletions
.gitlab-ci.yml
CMakeLists.txt
+4
-7
4 additions, 7 deletions
CMakeLists.txt
wrapper/python/CMakeLists.txt
+2
-6
2 additions, 6 deletions
wrapper/python/CMakeLists.txt
with
25 additions
and
17 deletions
.gitlab-ci.yml
+
19
−
4
View file @
010223b1
...
...
@@ -154,11 +154,19 @@ pkg_macos:
# - mkdir gpu_mod
# - git submodule sync --recursive
# - git submodule update --init --recursive
#TODO: loop on cuda versions
-
cd gpu_mod
-
if NOT EXIST build-cu11.4 (mkdir build-cu11.4) else (rmdir /S /Q build-cu11.4 & mkdir build-cu11.4)
-
cd build-cu11.4
-
cmake -G "Visual Studio 16 2019" ..
#- cmake -G "MinGW Makefiles" -DCMAKE_CUDA_COMPILER="E:/NVIDIA GPU Computing Toolkit/CUDA/v9.2/bin/nvcc.exe" ..
#-DCUDA_HOST_COMPILER="E:/TDM-GCC-64/bin/g++.exe" ..
-
cmake -G "Visual Studio 16 2019" -DCMAKE_CUDA_COMPILER="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.4/bin/nvcc.exe" -DCUDA_TOOLKIT_INCLUDE="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.4/include" -DCUDA_TOOLKIT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.4" ..
#- cmake -G "MinGW Makefiles" -DCMAKE_CUDA_COMPILER="E:/NVIDIA GPU Computing Toolkit/CUDA/v11.4/bin/nvcc.exe" ..
#-DCUDA_HOST_COMPILER="E:/TDM-GCC-64/bin/g++.exe" ..
-
cmake --build . --config %BUILD_CONFIG%
-
move %BUILD_CONFIG%\gm.dll .
-
cd ..
-
if NOT EXIST build-cu12.1 (mkdir build-cu12.1) else (rmdir /S /Q build-cu12.1 & mkdir build-cu12.1)
-
cd build-cu12.1
-
cmake -G "Visual Studio 16 2019" -DCMAKE_CUDA_COMPILER="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.1/bin/nvcc.exe" -DCUDA_TOOLKIT_INCLUDE="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.1/include" -DCUDA_TOOLKIT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.1" ..
#- cmake -G "MinGW Makefiles" -DCMAKE_CUDA_COMPILER="E:/NVIDIA GPU Computing Toolkit/CUDA/v12.1/bin/nvcc.exe" ..
#-DCUDA_HOST_COMPILER="E:/TDM-GCC-64/bin/g++.exe" ..
-
cmake --build . --config %BUILD_CONFIG%
-
move %BUILD_CONFIG%\gm.dll .
-
cd ..\..
...
...
@@ -187,7 +195,7 @@ pkg_win:
.build_gpu_mod
:
&build_gpu_mod
before_script
:
# TODO: loop on
9.2 and 11.4 (cuda
versions
)
before_script
:
# TODO: loop on
the two
versions
-
cd gpu_mod; if [[ ! -d build-cu12.1 ]]; then mkdir build-cu12.1; fi; cd build-cu12.1
-
cmake -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-12.1 -DCMAKE_CUDA_COMPILER=/usr/local/cuda-12.1/bin/nvcc .. && make
-
cd ../..
...
...
@@ -545,7 +553,14 @@ pkg_linux_purepy_release_openblaso:
-
cd gpu_mod
-
if NOT EXIST build-cu11.4 (mkdir build-cu11.4) else (rmdir /S /Q build-cu11.4 & mkdir build-cu11.4)
-
cd build-cu11.4
-
cmake -G "Visual Studio 16 2019" ..
-
cmake -G "Visual Studio 16 2019" -DCMAKE_CUDA_COMPILER="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.4/bin/nvcc.exe" -DCUDA_TOOLKIT_INCLUDE="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.4/include" -DCUDA_TOOLKIT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.4" ..
#- cmake -G "MinGW Makefiles" -DCMAKE_CUDA_COMPILER="E:/NVIDIA GPU Computing Toolkit/CUDA/v9.2/bin/nvcc.exe" ..
#-DCUDA_HOST_COMPILER="E:/TDM-GCC-64/bin/g++.exe" ..
-
cmake --build . --config %BUILD_CONFIG%
-
move %BUILD_CONFIG%\gm.dll .
-
cd ..
-
if NOT EXIST build-cu12.1 (mkdir build-cu12.1) else (rmdir /S /Q build-cu12.1 & mkdir build-cu12.1)
-
cd build-cu12.1
-
cmake -G "Visual Studio 16 2019" -DCMAKE_CUDA_COMPILER="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.1/bin/nvcc.exe" -DCUDA_TOOLKIT_INCLUDE="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.1/include" -DCUDA_TOOLKIT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.1" ..
#- cmake -G "MinGW Makefiles" -DCMAKE_CUDA_COMPILER="E:/NVIDIA GPU Computing Toolkit/CUDA/v9.2/bin/nvcc.exe" ..
#-DCUDA_HOST_COMPILER="E:/TDM-GCC-64/bin/g++.exe" ..
-
cmake --build . --config %BUILD_CONFIG%
-
move %BUILD_CONFIG%\gm.dll .
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
4
−
7
View file @
010223b1
...
...
@@ -729,19 +729,16 @@ if(USE_GPU_MOD)
target_link_libraries
(
${
FAUST_TARGET
}
dl
)
endif
(
UNIX
)
# TODO: used versions of CUDA and include dir should be CMake variables
if
(
WIN32
)
# do not support CUDA 9.2 on Windows (require too old version VS <= 2017)
set
(
CUDA_VERSIONS cu11.4
)
else
()
set
(
CUDA_VERSIONS cu12.1;cu11.4
)
endif
()
# do not support CUDA 9.2 on Windows (require too old version VS <= 2017)
set
(
CUDA_VERSIONS cu11.4
)
set
(
CUDA_VERSIONS cu12.1;cu11.4
)
foreach
(
CUDA_CONF IN LISTS CUDA_VERSIONS
)
string
(
REGEX REPLACE
"
\\
."
"-
${
CUDA_CONF
}
."
GPU_MOD_LIB_CUDA_CONF
${
GPU_MOD_LIB
}
)
# if ${GPU_MOD_LIB} is already a symlink, then we've already gone through it, skip
if
(
NOT IS_SYMLINK
${
GPU_MOD_INCLUDE_DIR
}
/../build-
${
CUDA_CONF
}
/
${
GPU_MOD_LIB
}
)
file
(
COPY
${
GPU_MOD_INCLUDE_DIR
}
/../build-
${
CUDA_CONF
}
/
${
GPU_MOD_LIB
}
DESTINATION
${
PROJECT_BINARY_DIR
}
)
file
(
RENAME
${
PROJECT_BINARY_DIR
}
/
${
GPU_MOD_LIB
}
${
GPU_MOD_INCLUDE_DIR
}
/../build-
${
CUDA_CONF
}
/
${
GPU_MOD_LIB_CUDA_CONF
}
)
if
(
CUDA_CONF MATCHES
"cu1
1.4
"
)
if
(
CUDA_CONF MATCHES
"cu1
2.1
"
)
file
(
CREATE_LINK
${
GPU_MOD_LIB_CUDA_CONF
}
${
GPU_MOD_INCLUDE_DIR
}
/../build-
${
CUDA_CONF
}
/
${
GPU_MOD_LIB
}
RESULT SYMLINK_OK SYMBOLIC
)
install
(
FILES
${
GPU_MOD_INCLUDE_DIR
}
/../build-
${
CUDA_CONF
}
/
${
GPU_MOD_LIB
}
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_EXECUTE WORLD_READ
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
wrapper/python/CMakeLists.txt
+
2
−
6
View file @
010223b1
...
...
@@ -199,12 +199,8 @@ if(USE_GPU_MOD)
get_filename_component
(
GPU_MOD_EXT
${
GPU_MOD_LIB
}
LAST_EXT
)
get_filename_component
(
GPU_MOD_NAME
${
GPU_MOD_LIB
}
NAME_WLE
)
# TODO: used versions of CUDA and include dir should be CMake variables
if
(
WIN32
)
# do not support CUDA 9.2 on Windows (require too old version VS <= 2017)
set
(
CUDA_VERSIONS 11.4
)
else
()
set
(
CUDA_VERSIONS 12.1;11.4
)
endif
()
# do not support CUDA 9.2 on Windows (require too old version VS <= 2017)
set
(
CUDA_VERSIONS 12.1;11.4
)
foreach
(
CUDA_CONF IN LISTS CUDA_VERSIONS
)
set
(
GPU_MOD_BUILD_DIR
${
GPU_MOD_INCLUDE_DIR
}
/../build-cu
${
CUDA_CONF
}
)
if
(
NOT EXISTS
${
GPU_MOD_BUILD_DIR
}
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment