Skip to content

Commit

Permalink
remove device_resources include from linalg::map (#1540)
Browse files Browse the repository at this point in the history
Remove the device_resources.cuh include from linalg::map.

For the implicit integration, I don't have libraries like cusolver in the CI environment, and the build is currently failing with errors like

```
/project/_skbuild/linux-x86_64-3.8/cmake-build/_deps/raft-src/cpp/include/raft/core/device_resources.hpp:31:10:
       fatal error: cusolverDn.h: No such file or directory
```

(from https://github.com/benfred/implicit/actions/runs/5033022104/jobs/9026999533?pr=656)

Fix by not including device_resources here

Authors:
  - Ben Frederickson (https://github.com/benfred)

Approvers:
  - Corey J. Nolet (https://github.com/cjnolet)

URL: #1540
  • Loading branch information
benfred authored May 21, 2023
1 parent a196645 commit 26bc95e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cpp/include/raft/linalg/detail/map.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#pragma once

#include <raft/core/device_mdspan.hpp>
#include <raft/core/device_resources.hpp> // TODO: remove this
#include <raft/core/resource/cuda_stream.hpp>
#include <raft/core/resources.hpp>
#include <raft/util/cuda_utils.cuh>
Expand All @@ -28,6 +27,8 @@

#include <rmm/cuda_stream_view.hpp>

#include <thrust/tuple.h>

namespace raft::linalg::detail {

template <bool PassOffset, typename OutT, typename IdxT, typename Func, typename... InTs>
Expand Down
1 change: 1 addition & 0 deletions cpp/test/linalg/map.cu
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "unary_op.cuh"
#include <gtest/gtest.h>
#include <raft/core/device_mdspan.hpp>
#include <raft/core/device_resources.hpp>
#include <raft/core/operators.hpp>
#include <raft/core/resource/cuda_stream.hpp>
#include <raft/linalg/eltwise.cuh>
Expand Down
1 change: 1 addition & 0 deletions cpp/test/neighbors/ann_cagra.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <raft_internal/neighbors/naive_knn.cuh>

#include <raft/core/device_mdspan.hpp>
#include <raft/core/device_resources.hpp>
#include <raft/core/logger.hpp>
#include <raft/distance/distance_types.hpp>
#include <raft/neighbors/cagra.cuh>
Expand Down

0 comments on commit 26bc95e

Please sign in to comment.