cuCIM: Build CUDA 12 packages #572

jakirkham · 2023-06-10T02:11:14Z

Fixes #513
Fixes #582

Start building cuCIM for CUDA 12.

conda/environments/all_cuda-120_arch-x86_64.yaml

conda/recipes/cucim/meta.yaml

conda/recipes/libcucim/meta.yaml

dependencies.yaml

jakirkham · 2023-06-28T22:36:46Z

Thanks Bradley! 🙏

Have pushed some changes to address those comments above. Please take another look when you have a moment 🙂

.github/workflows/build.yaml

conda/recipes/cucim/meta.yaml

conda/recipes/libcucim/meta.yaml

dependencies.yaml

bdice · 2023-06-29T15:41:36Z

This is getting close! If someone can fix the Python tests, that'd be helpful.

Co-authored-by: Bradley Dice <bdice@bradleydice.com>

conda/recipes/libcucim/meta.yaml

Co-authored-by: Bradley Dice <bdice@bradleydice.com>

bdice

One question, otherwise LGTM!

conda/recipes/cucim/meta.yaml

bdice · 2023-06-29T20:12:42Z

@jakirkham I think this draft can be opened for broader review. Please remove the [WIP] from the title too.

jakirkham · 2023-07-18T23:55:24Z

Just noting that even though CI passes, there is still an issue in the CUDA 12.0 case as noted in comment ( #572 (review) ). So this isn't really working yet

As `branch-23.08` now contains CUDA 12 support, switch back to using that GHA in the cuCIM PR.

This is unset & unused as best we can tell. So drop this `echo` line.

jakirkham · 2023-07-25T20:14:03Z

conda/recipes/libcucim/build.sh

@@ -4,7 +4,6 @@ CUCIM_BUILD_TYPE=${CUCIM_BUILD_TYPE:-release}

 echo "CC          : ${CC}"
 echo "CXX         : ${CXX}"
-echo "CUDA        : ${CUDA}"


Dropping this line as it is unset & unused based on our prior discussion. This resolves issue ( #582 )

jakirkham · 2023-07-25T20:22:53Z

Looks like we are now picking up the CUDA 12 CTK packages on CI 🥳

GDS client library is available at '$PREFIX/targets/x86_64-linux/include/cufile.h' and '$PREFIX/targets/x86_64-linux/lib/libcufile.so'
$ mkdir -p $SRC_DIR/temp/cuda/include $SRC_DIR/temp/cuda/lib64
$ cp -Pf $PREFIX/targets/x86_64-linux/include/cufile.h $SRC_DIR/temp/cuda/include/
$ cp -Pf $PREFIX/targets/x86_64-linux/lib/libcufile.so $PREFIX/targets/x86_64-linux/lib/libcufile.so.0 $PREFIX/targets/x86_64-linux/lib/libcufile.so.1.5.0 $PREFIX/targets/x86_64-linux/lib/libcufile_rdma.so $PREFIX/targets/x86_64-linux/lib/libcufile_rdma.so.1 $PREFIX/targets/x86_64-linux/lib/libcufile_rdma.so.1.5.0 $SRC_DIR/temp/cuda/lib64/
nvJPEG client library is available at '$PREFIX/targets/x86_64-linux/include/nvjpeg.h' and '$PREFIX/targets/x86_64-linux/lib/libnvjpeg_static.a'
$ mkdir -p $SRC_DIR/temp/cuda/include $SRC_DIR/temp/cuda/lib64
$ cp -Pf $PREFIX/targets/x86_64-linux/include/nvjpeg.h $SRC_DIR/temp/cuda/include/
$ cp -Pf $PREFIX/targets/x86_64-linux/lib/libnvjpeg.so $PREFIX/targets/x86_64-linux/lib/libnvjpeg.so.12 $PREFIX/targets/x86_64-linux/lib/libnvjpeg.so.12.0.0.28 $PREFIX/targets/x86_64-linux/lib/libnvjpeg_static.a $SRC_DIR/temp/cuda/lib64/

grlee77

Thanks, it looks good to me.

I guess the section we discussed under

    if [ ! -f ${cufile_include}/cufile.h ]; then
        c_echo_err Y "GDS client library is not available! Downloading the redistributable package to get cufile.h and libraries."

where it downloads x86_64 GDS can be updated in a follow up PR to not download if on aarch64?

jakirkham · 2023-07-25T20:55:19Z

Yeah it sounded like from our discussion earlier that @gigony was picking that piece up in a new PR

vyasr

A few small questions and suggestions, then we should be good to go.

conda/recipes/cucim/meta.yaml

conda/recipes/libcucim/meta.yaml

vyasr · 2023-07-25T21:22:57Z

dependencies.yaml

+              - cuda-version=11.8
              - nvcc_linux-64=11.8
+              - libcufile=1.4.0.31
+              - libcufile-dev=1.4.0.31
+              - libnvjpeg=11.6.0.55
+              - libnvjpeg-dev=11.6.0.55


Not an absolute must, but it would be nice to split this into a separate matrix entry for all cuda 11.8 (x86 and arm) since half of these are common.

Ah actually this doesn't work. dfg doesn't (yet) support multiple matches with different subsets of the matrix. Never mind!

Oh interesting! Ok should we file an issue here to follow up?

Filed as issue ( #585 ). Please add more details there

run

Co-authored-by: Vyas Ramasubramani <vyas.ramasubramani@gmail.com>

cuCIM only uses `cuda-nvrtc` through Python indirectly via CuPy. So this usage of `cuda-nvrtc` shouldn't be needed. So drop it.

This should already be added via `libcufile-dev` in `host`.

vyasr

LGTM!

gigony

Thanks @jakirkham for handling CUDA 12 build issues!
Looks good to me!

jakirkham · 2023-07-25T22:21:55Z

Thanks all! 🙏

jakirkham · 2023-07-25T22:22:00Z

/merge

bdice

Final changes LGTM!

jakirkham · 2023-07-26T03:17:36Z

I guess the section we discussed under
    if [ ! -f ${cufile_include}/cufile.h ]; then
        c_echo_err Y "GDS client library is not available! Downloading the redistributable package to get cufile.h and libraries."
where it downloads x86_64 GDS can be updated in a follow up PR to not download if on aarch64?

Filed for follow up in issue ( #586 )

jakirkham added 5 commits June 9, 2023 18:20

Configure CUDA 12.0 GHA builds

f020023

Update cuCIM dependencies for CUDA 12

7821b1d

Run RAPIDS dependency file generator

48ffa07

Update Conda recipes for CUDA 12

af84898

Fix minor_version in cucim recipe

03acaa9

jakirkham added improvement Improves an existing functionality non-breaking Introduces a non-breaking change labels Jun 28, 2023

jakirkham added 5 commits June 27, 2023 18:20

Merge branch 'branch-23.08' into cuda-12

2941d79

Drop extra blank line

f2fda02

Add CUDA 12 to dependencies.yaml

c0f9dce

Refresh envs

811f370

Add cuda_spec to meta.yaml's Jinja vars

586d323

bdice requested changes Jun 28, 2023

View reviewed changes

jakirkham added 3 commits June 28, 2023 15:35

Use pin_compatible with cuda-version

a4778b4

Use cuda-version

b250b1d

Use cuda-nvcc (instead of specifying arch)

cedc1b8

jakirkham requested a review from bdice June 28, 2023 22:35

bdice reviewed Jun 29, 2023

View reviewed changes

Fix missing GHA branch in workflow

4fb96ad

Co-authored-by: Bradley Dice <bdice@bradleydice.com>

jakirkham commented Jun 29, 2023

View reviewed changes

conda/recipes/libcucim/meta.yaml Outdated Show resolved Hide resolved

jakirkham and others added 2 commits June 29, 2023 12:56

Drop unused Jinja variables

7a10826

Co-authored-by: Bradley Dice <bdice@bradleydice.com>

Combine archs in dependencies.yaml

1559ae5

Co-authored-by: Bradley Dice <bdice@bradleydice.com>

jakirkham requested a review from bdice June 29, 2023 19:58

bdice approved these changes Jun 29, 2023

View reviewed changes

conda/recipes/cucim/meta.yaml Outdated Show resolved Hide resolved

jakirkham marked this pull request as ready for review June 29, 2023 20:24

jakirkham requested a review from a team as a code owner June 29, 2023 20:24

jakirkham changed the title ~~[WIP] cuCIM: Build CUDA 12 packages~~ cuCIM: Build CUDA 12 packages Jun 29, 2023

jakirkham added 2 commits July 17, 2023 18:44

Add libcufile* & libnvjpeg* to dependencies

59406a8

Add libnvjpeg-static to CUDA 12 dependencies

e7e1aa9

jakirkham added 6 commits July 25, 2023 10:55

Suport CUDA 12 CTK packages' targets/<arch> dir

2ce1425

Revert to using branch-23.08 GHA workflows

a7bea93

As `branch-23.08` now contains CUDA 12 support, switch back to using that GHA in the cuCIM PR.

Fix typo in x86_64

3fdcd90

Fix nvjpeg_search typos

220de6e

Drop duplicate targets directory nesting

3336a0e

Drop unneeded CUDA echo line

6d79d60

This is unset & unused as best we can tell. So drop this `echo` line.

jakirkham commented Jul 25, 2023

View reviewed changes

raydouglass approved these changes Jul 25, 2023

View reviewed changes

grlee77 approved these changes Jul 25, 2023

View reviewed changes

vyasr requested changes Jul 25, 2023

View reviewed changes

jakirkham and others added 4 commits July 25, 2023 14:28

Use arch instead of uname -m

4b601e3

Co-authored-by: Vyas Ramasubramani <vyas.ramasubramani@gmail.com>

Drop extra cudatoolkit dependency from cucim

229af54

Drop unneeded cuda-nvrtc dependency

78dfa55

cuCIM only uses `cuda-nvrtc` through Python indirectly via CuPy. So this usage of `cuda-nvrtc` shouldn't be needed. So drop it.

Drop libcufile from run as well

e2b8fe4

This should already be added via `libcufile-dev` in `host`.

jakirkham requested a review from vyasr July 25, 2023 22:01

vyasr approved these changes Jul 25, 2023

View reviewed changes

gigony approved these changes Jul 25, 2023

View reviewed changes

bdice approved these changes Jul 25, 2023

View reviewed changes

jakirkham added this to the v23.08.00 milestone Jul 25, 2023

rapids-bot bot merged commit 0a6bf42 into rapidsai:branch-23.08 Jul 25, 2023
21 checks passed

jakirkham deleted the cuda-12 branch July 25, 2023 23:49

jakirkham mentioned this pull request Jul 26, 2023

Refactoring common aarch64 & x86_64 items in dependencies.yaml #585

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cuCIM: Build CUDA 12 packages #572

cuCIM: Build CUDA 12 packages #572

jakirkham commented Jun 10, 2023 •

edited

Loading

jakirkham commented Jun 28, 2023

bdice commented Jun 29, 2023

bdice left a comment

bdice commented Jun 29, 2023

jakirkham commented Jul 18, 2023

jakirkham Jul 25, 2023

jakirkham commented Jul 25, 2023

grlee77 left a comment

jakirkham commented Jul 25, 2023

vyasr left a comment

vyasr Jul 25, 2023

vyasr Jul 25, 2023

jakirkham Jul 25, 2023

jakirkham Jul 26, 2023

vyasr left a comment

gigony left a comment

jakirkham commented Jul 25, 2023

jakirkham commented Jul 25, 2023

bdice left a comment

jakirkham commented Jul 26, 2023 •

edited

Loading

cuCIM: Build CUDA 12 packages #572

cuCIM: Build CUDA 12 packages #572

Conversation

jakirkham commented Jun 10, 2023 • edited Loading

jakirkham commented Jun 28, 2023

bdice commented Jun 29, 2023

bdice left a comment

Choose a reason for hiding this comment

bdice commented Jun 29, 2023

jakirkham commented Jul 18, 2023

jakirkham Jul 25, 2023

Choose a reason for hiding this comment

jakirkham commented Jul 25, 2023

grlee77 left a comment

Choose a reason for hiding this comment

jakirkham commented Jul 25, 2023

vyasr left a comment

Choose a reason for hiding this comment

vyasr Jul 25, 2023

Choose a reason for hiding this comment

vyasr Jul 25, 2023

Choose a reason for hiding this comment

jakirkham Jul 25, 2023

Choose a reason for hiding this comment

jakirkham Jul 26, 2023

Choose a reason for hiding this comment

vyasr left a comment

Choose a reason for hiding this comment

gigony left a comment

Choose a reason for hiding this comment

jakirkham commented Jul 25, 2023

jakirkham commented Jul 25, 2023

bdice left a comment

Choose a reason for hiding this comment

jakirkham commented Jul 26, 2023 • edited Loading

jakirkham commented Jun 10, 2023 •

edited

Loading

jakirkham commented Jul 26, 2023 •

edited

Loading