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

Update to 2.2.0 (and switch to monorepo) #6

Merged
merged 15 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from 12 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
39 changes: 30 additions & 9 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions .ci_support/linux_64_.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.8
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
14 changes: 0 additions & 14 deletions .ci_support/linux_aarch64_.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
- '11'
cdt_arch:
- aarch64
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.8
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
10 changes: 0 additions & 10 deletions .ci_support/linux_ppc64le_.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.8
target_platform:
- linux-ppc64le
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
6 changes: 0 additions & 6 deletions .ci_support/win_64_.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
cxx_compiler:
- vs2019
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
22 changes: 11 additions & 11 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
azure:
free_disk_space: true
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
Expand Down
37 changes: 25 additions & 12 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
if not exist %PREFIX% mkdir %PREFIX%
mkdir %LIBRARY_LIB%\cmake
mkdir %LIBRARY_INC%

move thrust\thrust\cmake %LIBRARY_LIB%\cmake\thrust
move cub\cub\cmake %LIBRARY_LIB%\cmake\cub
move libcudacxx\lib\cmake\libcudacxx %LIBRARY_LIB%\cmake

move thrust\thrust %LIBRARY_INC%
move cub\cub %LIBRARY_INC%
move libcudacxx\include\cuda %LIBRARY_INC%
move libcudacxx\include\nv %LIBRARY_INC%
@echo on

mkdir build_release
if errorlevel 1 exit 1

pushd build_release
if errorlevel 1 exit 1

cmake %CMAKE_ARGS% ^
-G "Ninja" ^
-DCMAKE_BUILD_TYPE:STRING=Release ^
-DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% ^
-DCMAKE_INSTALL_LIBDIR:PATH=%LIBRARY_LIB% ^
jakirkham marked this conversation as resolved.
Show resolved Hide resolved
-DCCCL_ENABLE_TESTING:BOOL=OFF ^
-DCUB_ENABLE_TESTING:BOOL=OFF ^
-DTHRUST_ENABLE_TESTING:BOOL=OFF ^
-DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS:BOOL=OFF ^
"%SRC_DIR%"
if errorlevel 1 exit 1

cmake --build . --target install
if errorlevel 1 exit 1

popd
if errorlevel 1 exit 1
28 changes: 18 additions & 10 deletions recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
#!/bin/bash
#!/usr/bin/env bash

mkdir -p ${PREFIX}/lib/cmake
mkdir -p ${PREFIX}/include
set -xeuo pipefail

mv -v thrust/thrust/cmake ${PREFIX}/lib/cmake/thrust
mv -v cub/cub/cmake ${PREFIX}/lib/cmake/cub
cp -rv libcudacxx/lib/cmake/libcudacxx ${PREFIX}/lib/cmake
mkdir build_release
pushd build_release

cp -rv thrust/thrust ${PREFIX}/include
cp -rv cub/cub ${PREFIX}/include
cp -rv libcudacxx/include/cuda ${PREFIX}/include
cp -rv libcudacxx/include/nv ${PREFIX}/include
cmake ${CMAKE_ARGS} \
-G "Ninja" \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_INSTALL_PREFIX:PATH="${PREFIX}" \
-DCMAKE_INSTALL_LIBDIR:PATH="${PREFIX}/lib" \
jakirkham marked this conversation as resolved.
Show resolved Hide resolved
-DCCCL_ENABLE_TESTING:BOOL=OFF \
-DCUB_ENABLE_TESTING:BOOL=OFF \
-DTHRUST_ENABLE_TESTING:BOOL=OFF \
-DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS:BOOL=OFF \
"${SRC_DIR}"

cmake --build . --target install

popd
Loading