Revert recent cmake updates (#657)

We have a few folks out of the office and cuml's CI is breaking because of a couple subtle recent changes to RAFT's cmake infrastructure and how the resulting exports are being packaged up in the conda packages. I'm reverting these commits to free up cuml's CI until we figure out how to fix the issue. Authors: - Corey J. Nolet (https://github.com/cjnolet) Approvers: - William Hicks (https://github.com/wphicks) URL: #657
rapidsai · May 17, 2022 · 45e95d1 · 45e95d1
1 parent 136c77a
commit 45e95d1
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 40 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -356,12 +356,12 @@ install(TARGETS raft
 
 install(TARGETS raft_distance
         DESTINATION ${lib_dir}
-        COMPONENT raft
+        COMPONENT raft_distance
         EXPORT raft-distance-exports)
 
 install(TARGETS raft_nn
         DESTINATION ${lib_dir}
-        COMPONENT raft
+        COMPONENT raft_nn
         EXPORT raft-nn-exports)
 
 if(TARGET raft_distance_lib)
@@ -394,44 +394,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/raft/version_config.hpp
         COMPONENT raft
         DESTINATION include/raft)
 
-##############################################################################
-# - export/install optional components  --------------------------------------
-
-include("${rapids-cmake-dir}/export/write_dependencies.cmake")
-
-set(raft_components distance nn)
-set(raft_install_comp "" "")
-if(TARGET raft_distance_lib)
-  list(APPEND raft_components distance-lib)
-  list(APPEND raft_install_comp _distance)
-endif()
-if(TARGET raft_nn_lib)
-  list(APPEND raft_components  nn-lib)
-  list(APPEND raft_install_comp _nn)
-endif()
-
-foreach(comp install_comp IN ZIP_LISTS raft_components raft_install_comp)
-  install(
-          EXPORT raft-${comp}-exports
-          FILE raft-${comp}-targets.cmake
-          NAMESPACE raft::
-          DESTINATION "${lib_dir}/cmake/raft"
-          COMPONENT raft${install_comp}
-  )
-  export(
-          EXPORT raft-${comp}-exports
-          FILE ${RAFT_BINARY_DIR}/raft-${comp}-targets.cmake
-          NAMESPACE raft::
-  )
-  rapids_export_write_dependencies(
-          BUILD raft-${comp}-exports "${PROJECT_BINARY_DIR}/raft-${comp}-dependencies.cmake"
-  )
-  rapids_export_write_dependencies(
-          INSTALL raft-${comp}-exports "${PROJECT_BINARY_DIR}/rapids-cmake/raft/export/${install_comp}/raft-${comp}-dependencies.cmake"
-  )
-
-endforeach()
-
 ##############################################################################
 # - install export -----------------------------------------------------------
 set(doc_string
@@ -500,6 +462,44 @@ raft_export(BUILD raft
         NAMESPACE raft::
         FINAL_CODE_BLOCK code_string)
 
+##############################################################################
+# - export/install optional components  --------------------------------------
+
+include("${rapids-cmake-dir}/export/write_dependencies.cmake")
+
+set(raft_components distance nn)
+set(raft_install_comp distance nn)
+if(TARGET raft_distance_lib)
+  list(APPEND raft_components distance-lib)
+  list(APPEND raft_install_comp distance)
+endif()
+if(TARGET raft_nn_lib)
+  list(APPEND raft_components  nn-lib)
+  list(APPEND raft_install_comp nn)
+endif()
+
+foreach(comp install_comp IN ZIP_LISTS raft_components raft_install_comp)
+  install(
+          EXPORT raft-${comp}-exports
+          FILE raft-${comp}-targets.cmake
+          NAMESPACE raft::
+          DESTINATION "${lib_dir}/cmake/raft"
+          COMPONENT raft_${install_comp}
+  )
+  export(
+          EXPORT raft-${comp}-exports
+          FILE ${RAFT_BINARY_DIR}/raft-${comp}-targets.cmake
+          NAMESPACE raft::
+  )
+  rapids_export_write_dependencies(
+          BUILD raft-${comp}-exports "${PROJECT_BINARY_DIR}/raft-${comp}-dependencies.cmake"
+  )
+  rapids_export_write_dependencies(
+          INSTALL raft-${comp}-exports "${PROJECT_BINARY_DIR}/rapids-cmake/raft/export/${install_comp}/raft-${comp}-dependencies.cmake"
+  )
+
+endforeach()
+
 ##############################################################################
 # - build test executable ----------------------------------------------------
 

diff --git a/cpp/test/spatial/selection.cu b/cpp/test/spatial/selection.cu
@@ -237,6 +237,8 @@ class SelectionTest : public testing::TestWithParam<typename ParamsReader<KeyT,
 
   void run()
   {
+    // TODO: Fix test failure in RAFT CI
+    GTEST_SKIP();
     if (ref.not_supported || res.not_supported) { GTEST_SKIP(); }
     ASSERT_TRUE(hostVecMatch(ref.get_out_dists(), res.get_out_dists(), Compare<KeyT>()));
     ASSERT_TRUE(hostVecMatch(ref.get_out_ids(), res.get_out_ids(), Compare<IdxT>()));