Various config fixes

wavefunction91 · Oct 30, 2023 · e068dc5 · e068dc5
1 parent 3d21260
commit e068dc5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/include/macis/types.hpp b/include/macis/types.hpp
@@ -16,8 +16,8 @@
 
 namespace macis {
 
-namespace KokkosEx =
-    MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE;
+namespace KokkosEx = Kokkos;
+//    MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE;
 
 template <typename T, size_t rank>
 using col_major_span =

diff --git a/src/sparsexx/CMakeLists.txt b/src/sparsexx/CMakeLists.txt
@@ -93,7 +93,7 @@ if( SPARSEXX_ENABLE_RANGES_V3 )
     add_subdirectory(${range_v3_download_SOURCE_DIR} ${range_v3_download_BINARY_DIR})
     add_library( ranges INTERFACE IMPORTED )
     target_link_libraries( ranges INTERFACE range-v3 )
-    target_compile_definitions( ranges INTERFACE "SPARSEXX_ENABLE_RANGES_V3=1" )
+    #target_compile_definitions( ranges INTERFACE "SPARSEXX_ENABLE_RANGES_V3=1" )
   endif()
   list(APPEND SPARSEXX_EXTERNAL_LIBRARIES ranges)
 endif()
@@ -128,7 +128,7 @@ endif()
 if( TARGET OpenMP::OpenMP_CXX )
   target_link_libraries( sparsexx PUBLIC OpenMP::OpenMP_CXX )
 endif()
-target_link_libraries     ( sparsexx PRIVATE ${SPARSEXX_EXTERNAL_LIBRARIES} )
+target_link_libraries     ( sparsexx PUBLIC ${SPARSEXX_EXTERNAL_LIBRARIES} )
 target_include_directories( sparsexx PUBLIC 
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>

diff --git a/src/sparsexx/include/sparsexx/matrix_types/coo_matrix_ops.hpp b/src/sparsexx/include/sparsexx/matrix_types/coo_matrix_ops.hpp
@@ -10,9 +10,10 @@
 
 #include <iostream>
 
+#include <sparsexx/sparsexx_config.hpp>
 #include "coo_matrix.hpp"
 
-#if SPARSEXX_ENABLE_RANGES_V3
+#ifdef SPARSEXX_ENABLE_RANGES_V3
 #include <range/v3/all.hpp>
 #endif
 #include <algorithm>
@@ -22,7 +23,7 @@ namespace sparsexx {
 
 template <typename T, typename index_t, typename Alloc>
 void coo_matrix<T, index_t, Alloc>::sort_by_row_index() {
-#if SPARSEXX_ENABLE_RANGES_V3
+#ifdef SPARSEXX_ENABLE_RANGES_V3
   auto coo_zip = ranges::views::zip(rowind_, colind_, nzval_);
 
   // Sort lex by row index
@@ -73,7 +74,7 @@ void coo_matrix<T, index_t, Alloc>::sort_by_row_index() {
 template <typename T, typename index_t, typename Alloc>
 void coo_matrix<T, index_t, Alloc>::expand_from_triangle() {
 
-#if SPARSEXX_ENABLE_RANGES_V3
+#ifdef SPARSEXX_ENABLE_RANGES_V3
 
   auto idx_zip = ranges::views::zip(rowind_, colind_);
 
@@ -131,7 +132,7 @@ void coo_matrix<T, index_t, Alloc>::expand_from_triangle() {
 
 template <typename T, typename index_t, typename Alloc>
 void coo_matrix<T, index_t, Alloc>::sort_by_col_index() {
-#if SPARSEXX_ENABLE_RANGES_V3
+#ifdef SPARSEXX_ENABLE_RANGES_V3
   auto coo_zip = ranges::views::zip(rowind_, colind_, nzval_);
 
   // Sort lex by row index