Skip to content

Commit 333ceba

Browse files
authored
Update Ginkgo dependency to version 1.7.0 (#263)
1 parent 68c3862 commit 333ceba

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ endif()
237237

238238
if("${BUILD_SPLINES_KERNEL}")
239239
# Ginkgo
240-
find_package(Ginkgo 1.6.0 EXACT REQUIRED)
240+
find_package(Ginkgo 1.7.0 EXACT REQUIRED)
241241
target_link_libraries(DDC INTERFACE Ginkgo::ginkgo)
242242
target_compile_definitions(DDC INTERFACE ginkgo_AVAIL)
243243
endif()

docker/doxygen/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN chmod +x /bin/bash_run \
3434
git \
3535
graphviz \
3636
texlive \
37-
&& git clone -b v1.6.0 https://github.com/ginkgo-project/ginkgo.git \
37+
&& git clone -b v1.7.0 https://github.com/ginkgo-project/ginkgo.git \
3838
&& cd ginkgo \
3939
&& cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGINKGO_BUILD_OMP=OFF -DGINKGO_BUILD_TESTS=OFF -DGINKGO_BUILD_EXAMPLES=OFF -DGINKGO_BUILD_BENCHMARKS=OFF \
4040
&& cmake --build build \

docker/latest/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RUN chmod +x /bin/bash_run \
5757
apt-get install -y --no-install-recommends \
5858
rocm-hip-sdk \
5959
;; esac \
60-
&& git clone -b v1.6.0 https://github.com/ginkgo-project/ginkgo.git \
60+
&& git clone -b v1.7.0 https://github.com/ginkgo-project/ginkgo.git \
6161
&& cd ginkgo \
6262
&& case "${BACKEND}" in \
6363
"cpu") \

docker/oldest/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN chmod +x /bin/bash_run \
5252
apt-get install -y --no-install-recommends \
5353
rocm-hip-sdk \
5454
;; esac \
55-
&& git clone -b v1.6.0 https://github.com/ginkgo-project/ginkgo.git \
55+
&& git clone -b v1.7.0 https://github.com/ginkgo-project/ginkgo.git \
5656
&& cd ginkgo \
5757
&& case "${BACKEND}" in \
5858
"cpu") \

include/ddc/misc/ginkgo_executors.hpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ inline std::shared_ptr<gko::Executor> create_gko_exec()
3838
return gko::CudaExecutor::
3939
create(exec_space.cuda_device(),
4040
create_default_host_executor(),
41-
false,
42-
gko::default_cuda_alloc_mode,
41+
std::make_shared<gko::CudaAllocator>(),
4342
exec_space.cuda_stream());
4443
}
4544
#endif
@@ -49,8 +48,7 @@ inline std::shared_ptr<gko::Executor> create_gko_exec()
4948
return gko::HipExecutor::
5049
create(exec_space.hip_device(),
5150
create_default_host_executor(),
52-
false,
53-
gko::default_hip_alloc_mode,
51+
std::make_shared<gko::HipAllocator>(),
5452
exec_space.hip_stream());
5553
}
5654
#endif

0 commit comments

Comments
 (0)