Skip to content

Commit

Permalink
Fix compiler CUDA
Browse files Browse the repository at this point in the history
Disable examples.
  • Loading branch information
Robadob committed Oct 25, 2023
1 parent 01bb261 commit c18544e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
4 changes: 1 addition & 3 deletions swig/conda/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ echo "swig_dir: $swig_dir"
mkdir -p build && cd build

# Configure CMake
cmake .. -DCMAKE_BUILD_TYPE=Release -DFLAMEGPU_BUILD_PYTHON=ON -DFLAMEGPU_BUILD_PYTHON_VENV=OFF -DFLAMEGPU_BUILD_PYTHON_CONDA=ON $build_arch $swig_exe $swig_dir -DPython_EXECUTABLE="$PYTHON"
# CMAKE_ARGS broke find_jitify for me, so disabled it for now. Might need to tweak our CMake for it to be usable?
# $CMAKE_ARGS
cmake .. -DCMAKE_BUILD_TYPE=Release -DFLAMEGPU_BUILD_PYTHON=ON -DFLAMEGPU_BUILD_PYTHON_VENV=OFF -DFLAMEGPU_BUILD_ALL_EXAMPLES=OFF -DFLAMEGPU_BUILD_PYTHON_CONDA=ON $build_arch $swig_exe $swig_dir $CMAKE_ARGS -DPython3_EXECUTABLE="$PYTHON"

# Build Python wheel
cmake --build . --target pyflamegpu --parallel $build_threads
Expand Down
6 changes: 6 additions & 0 deletions swig/conda/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# https://docs.conda.io/projects/conda-build/en/3.21.x/resources/compiler-tools.html#using-your-customized-compiler-package-with-conda-build-3
# https://github.com/rapidsai/cuml/blob/branch-23.12/conda/recipes/libcuml/conda_build_config.yaml
# https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml
cuda_compiler:
#- nvcc # [win] # installs/uses cudatoolkit package?
- cuda-nvcc # [linux] # installs/uses cuda-toolkit package?
9 changes: 6 additions & 3 deletions swig/conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ source:
requirements:
build:
- {{ compiler('cxx') }}
# - {{ compiler('cuda') }} # This causes conda build to crash??
- cuda-toolkit
- swig ==4.0.2 # CMake can't find this, but needs it to build swig from src? (>= does not work either), alt find where conda puts swig and pass path to CMake
- {{ compiler('cuda') }}
- cuda-cudart-dev # [linux]
- libcurand-dev # [linux]
- cuda-nvrtc-dev # [linux]
- swig ==4.0.2 # Have to manually direct swig to find this
- cmake
- python
- python-devtools
- pip
- setuptools >=40.8.0 # CMake can't find this when installed by conda
- wheel
Expand Down

0 comments on commit c18544e

Please sign in to comment.