fix multi-config and use the latest commit

Co-authored-by: Tobias Ribizel <ribizel@kit.edu>
ginkgo-project · Apr 13, 2022 · 22b1728 · 22b1728
1 parent 1325a96
commit 22b1728
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/.gitlab/image.yml b/.gitlab/image.yml
@@ -6,7 +6,7 @@
     - amdci
 
 .use_gko-nocuda-mvapich2-gnu5-llvm39-intel2018:
-  image: localhost:5000/hpccm_hip_be95edf6_gko-nocuda-mvapich2-gnu5-llvm39-intel2018
+  image: localhost:5000/hpccm_hip_2a7e5fd9_gko-nocuda-mvapich2-gnu5-llvm39-intel2018
   tags:
     - private_ci
     - amdci
@@ -61,14 +61,14 @@
     - cpu
 
 .use_gko-cuda110-mvapich2-gnu9-llvm9-intel2020:
-  image: localhost:5000/hpccm_hip_be95edf6_gko-cuda110-mvapich2-gnu9-llvm9-intel2020
+  image: localhost:5000/hpccm_hip_2a7e5fd9_gko-cuda110-mvapich2-gnu9-llvm9-intel2020
   tags:
     - private_ci
     - amdci
     - nvidia-gpu
 
 .use_gko_cuda114-openmpi-gnu11-llvm12:
-  image: localhost:5000/hpccm_hip_be95edf6_gko-cuda114-openmpi-gnu11-llvm12
+  image: localhost:5000/hpccm_hip_2a7e5fd9_gko-cuda114-openmpi-gnu11-llvm12
   tags:
     - private_ci
     - amdci
@@ -82,21 +82,21 @@
     - gpu
 
 .use_gko-rocm35-openmpi-gnu5-llvm50:
-  image: localhost:5000/hpccm_hip_be95edf6_gko-rocm35-openmpi-gnu5-llvm50
+  image: localhost:5000/hpccm_hip_2a7e5fd9_gko-rocm35-openmpi-gnu5-llvm50
   tags:
     - private_ci
     - amdci
     - gpu
 
 .use_gko-rocm45-mvapich2-gnu8-llvm8:
-  image: localhost:5000/hpccm_hip_be95edf6_gko-rocm45-mvapich2-gnu8-llvm8
+  image: localhost:5000/hpccm_hip_2a7e5fd9_gko-rocm45-mvapich2-gnu8-llvm8
   tags:
     - private_ci
     - amdci
     - gpu
 
 .use_gko-rocm502-openmpi-gnu11-llvm11:
-  image: localhost:5000/hpccm_hip_be95edf6_gko-rocm502-openmpi-gnu11-llvm11
+  image: localhost:5000/hpccm_hip_2a7e5fd9_gko-rocm502-openmpi-gnu11-llvm11
   tags:
     - private_ci
     - amdci

diff --git a/hip/CMakeLists.txt b/hip/CMakeLists.txt
@@ -279,9 +279,9 @@ if(GINKGO_HIP_AMDGPU)
     endforeach()
 endif()
 
-if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]" AND GINKGO_STATIC_OR_SHARED MATCHES "STATIC")
+if(GINKGO_STATIC_OR_SHARED MATCHES "STATIC")
     # Debug Static: Hip requires PIC flags
-    set(GINKGO_HIPCC_OPTIONS ${GINKGO_HIP_COMPILER_FLAGS} "-std=c++14 -DGKO_COMPILING_HIP -fPIC")
+    set(GINKGO_HIPCC_OPTIONS ${GINKGO_HIP_COMPILER_FLAGS} "-std=c++14 -DGKO_COMPILING_HIP $<$<CONFIG:Debug>:-fPIC>")
 else()
     set(GINKGO_HIPCC_OPTIONS ${GINKGO_HIP_COMPILER_FLAGS} "-std=c++14 -DGKO_COMPILING_HIP")
 endif()

diff --git a/test/base/device_matrix_data_kernels.cpp b/test/base/device_matrix_data_kernels.cpp
@@ -30,7 +30,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ******************************<GINKGO LICENSE>*******************************/
 
-#include "core/base/device_matrix_data_kernels.hpp"
+#include <ginkgo/core/base/device_matrix_data.hpp>
 
 
 #include <memory>
@@ -41,11 +41,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #include <ginkgo/core/base/array.hpp>
-#include <ginkgo/core/base/device_matrix_data.hpp>
 #include <ginkgo/core/base/executor.hpp>
 #include <ginkgo/core/base/matrix_data.hpp>
 
 
+#include "core/base/device_matrix_data_kernels.hpp"
 #include "core/test/utils.hpp"
 #include "core/test/utils/assertions.hpp"
 #include "test/utils/executor.hpp"

diff --git a/test/test_install/CMakeLists.txt b/test/test_install/CMakeLists.txt
@@ -57,9 +57,8 @@ if(GINKGO_BUILD_HIP)
     if (GINKGO_BUILD_SHARED_LIBS)
         set (GINKGO_PIC_OPTION "-fPIC")
         set (GINKGO_CUDA_PIC_OPTION "-Xcompiler '-fPIC'")
-    endif()
-    if (NOT GINKGO_BUILD_SHARED_LIBS AND CMAKE_BUILD_TYPE MATCHES [Dd][Ee][Bb][Uu][Gg])
-        set (GINKGO_PIC_OPTION "-fPIC")
+    else()
+        set (GINKGO_PIC_OPTION "$<$<CONFIG:Debug>:-fPIC>")
     endif()
     if (CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
         set(TESTINSTALL_CUDA_ARCH_FLAGS "${GINKGO_CUDA_ARCH_FLAGS}")