WIP: moving ndarray as a separate dependency

Author: guo.2154

CMakeLists.txt

@@ -6,6 +6,8 @@ file(READ "version.txt" FTK_VERSION)
 include(GNUInstallDirs)
 # include (ExternalProject)
 
+find_package(ndarray REQUIRED)
+
 option (FTK_BUILD_TESTS "Build tests" OFF)
 # option (FTK_BUILD_TESTS_XGC "Build XGC-specific tests" OFF)
 option (FTK_BUILD_PARAVIEW "Build ParaView plugins" OFF)
@@ -33,25 +35,19 @@ function (ftk_option name description default)
   set_property (CACHE FTK_USE_${name} PROPERTY STRINGS "TRUE;AUTO;FALSE")
 endfunction ()
 
-ftk_option (ADIOS1 "Use ADIOS1" FALSE) # not recommended
-ftk_option (ADIOS2 "Use ADIOS2" FALSE)
 ftk_option (Boost "Use Boost" FALSE) # not used
 ftk_option (CGAL "Use CGAL" FALSE) # experimental
 ftk_option (CUDA "Use CUDA" FALSE) # experimental
 ftk_option (DECAF "Use Decaf" FALSE) #experimental
 ftk_option (GSL "Use GSL (GNU Scientific Library)" FALSE)
 ftk_option (GMP "Use GMP (GNU Multiple Precision Arithmetic Library)" FALSE)
-ftk_option (HDF5 "Use HDF5" FALSE)
 ftk_option (Kokkos "Use Kokkos" FALSE) # experimental
 ftk_option (LevelDB "Use LevelDB" FALSE)
 ftk_option (METIS "Use METIS" FALSE)
 ftk_option (MPFR "Use MPFR" FALSE)
 ftk_option (MPI "Use MPI" FALSE)
 ftk_option (MPSolve "Use MPSolve" FALSE)
-ftk_option (NETCDF "Use NetCDF" FALSE)
 ftk_option (OpenMP "Use OpenMP" FALSE)
-ftk_option (PNETCDF "Use parallel-netcdf" FALSE)
-ftk_option (PNG "Use PNG" FALSE)
 ftk_option (Qt5 "Use Qt5" FALSE)
 ftk_option (RocksDB "Use RocksDB" FALSE)
 ftk_option (HIPSYCL "Use hipSYCL" FALSE) # experimental
@@ -68,7 +64,6 @@ ftk_option (VTK "Use VTK" FALSE)
 set (CMAKE_CXX_STANDARD 17)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
-
 find_package (Threads REQUIRED)
 
 if (FTK_USE_CGAL STREQUAL AUTO)
@@ -83,30 +78,6 @@ if (CGAL_FOUND)
   set (FTK_HAVE_CGAL TRUE)
 endif ()
 
-if (FTK_USE_ADIOS1 STREQUAL AUTO)
-  find_package (ADIOS QUIET)
-elseif (FTK_USE_ADIOS1) 
-  find_package (ADIOS REQUIRED)
-endif ()
-if (ADIOS_FOUND)
-  set (FTK_HAVE_ADIOS1 ON)
-  include_directories (${ADIOS_INCLUDE_DIRS})
-endif ()
-
-if (FTK_USE_ADIOS2 STREQUAL AUTO)
-  find_package (ADIOS2 QUIET)
-elseif (FTK_USE_ADIOS2)
-  find_package (ADIOS2 REQUIRED)
-endif ()
-if (ADIOS2_FOUND)
-  if (ADIOS2_HAVE_MPI)
-    set (FTK_USE_MPI ON)
-  endif ()
-  set (FTK_HAVE_ADIOS2 ON)
-  # set (ADIOS2_INCLUDE_DIRS ${ADIOS2_DIR}/include)
-  include_directories (${ADIOS2_INCLUDE_DIRS})
-endif ()
-
 if (FTK_USE_VTK STREQUAL AUTO)
   find_package (VTK QUIET)
 elseif (FTK_USE_VTK)
@@ -174,28 +145,6 @@ else ()
   # add_definitions (-DDIY_NO_MPI)
 endif ()
 
-if (FTK_USE_HDF5 STREQUAL AUTO)
-  find_package (HDF5 QUIET)
-elseif (FTK_USE_HDF5)
-  find_package (HDF5 REQUIRED)
-endif()
-if (HDF5_FOUND)
-  set (FTK_HAVE_HDF5 TRUE)
-  include_directories (${HDF5_INCLUDE_DIRS})
-endif ()
-
-if (FTK_USE_NETCDF STREQUAL AUTO)
-  find_package (netCDF QUIET)
-elseif (FTK_USE_NETCDF)
-  find_package (netCDF REQUIRED)
-endif ()
-if (netCDF_FOUND)
-  set (FTK_HAVE_NETCDF TRUE)
-  # include_directories (${NETCDF_INCLUDE_DIR})
-  # install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindNetCDF.cmake
-  #   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/FTK/)
-endif ()
-
 if (FTK_USE_MPSolve STREQUAL AUTO)
   find_package (MPSolve QUIET)
 elseif (FTK_USE_MPSolve)
@@ -252,26 +201,6 @@ if (TBB_FOUND)
   include_directories (${TBB_INCLUDE_DIRS})
 endif ()
 
-if (FTK_USE_PNETCDF STREQUAL AUTO)
-  find_package (PNetCDF QUIET)
-elseif (FTK_USE_PNETCDF)
-  find_package (PNetCDF REQUIRED)
-endif()
-if (PNETCDF_FOUND)
-  set (FTK_HAVE_PNETCDF TRUE)
-  include_directories (${PNETCDF_INCLUDE_DIR})
-endif ()
-
-if (FTK_USE_PNG STREQUAL AUTO)
-  find_package (PNG QUIET)
-elseif (FTK_USE_PNG)
-  find_package (PNG REQUIRED)
-endif ()
-if (PNG_FOUND)
-  set (FTK_HAVE_PNG TRUE)
-  include_directories (${PNG_INCLUDE_DIRS})
-endif ()
-
 if (FTK_USE_RocksDB STREQUAL AUTO)
   find_package (RocksDB QUIET)
 elseif (FTK_USE_RocksDB)
@@ -469,13 +398,6 @@ if (${GMP_FOUND})
   message("      Include path:    ${GMP_INCLUDE_DIRS}")
   message("      Libraries:       ${GMP_LIBRARIES}")
 endif()
-message("    HDF5:        ${FTK_USE_HDF5} ${HDF5_FOUND}")
-if (${FTK_HAVE_HDF5})
-  message("      Version:           ${HDF5_VERSION}")
-  message("      Include path:      ${HDF5_INCLUDE_DIRS}")
-  message("      Definitions:       ${HDF5_DEFINITIONS}")
-  message("      Libraries:         ${HDF5_LIBRARIES}")
-endif ()
 message("    hipSYCL*     ${FTK_USE_HIPSYCL} ${HIPSYCL_FOUND}")
 if (${FTK_HAVE_HIPSYCL})
   message("      SYCLCC:            ${HIPSYCL_SYCLCC}")
@@ -499,11 +421,6 @@ if (${FTK_HAVE_MPI})
   message("      mpiexec:           ${MPIEXEC_EXECUTABLE}")
 endif ()
 message("    MPSolve:     ${FTK_USE_MPSolve} ${MPSolve_FOUND}")
-message("    netCDF:      ${FTK_USE_NETCDF} ${NETCDF_FOUND}")
-if (${FTK_HAVE_NETCDF})
-  message("      Version:         ${NetCDFVersion}")
-  message("      Path:            ${netCDF_INSTALL_PREFIX}")
-endif ()
 message("    OpenMP*:     ${FTK_USE_OpenMP} ${OpenMP_CXX_FOUND}")
 if (${FTK_HAVE_OPENMP})
   message("      Version:         ${OpenMP_CXX_VERSION}")
@@ -514,15 +431,6 @@ message("    ParaView:     ${FTK_BUILD_PARAVIEW}")
 if (${FTK_HAVE_PARAVIEW})
   message("      ParaView path:   ${ParaView_DIR}")
 endif ()
-message("    PNETCDF*:    ${FTK_USE_PNETCDF} ${PNetCDF_FOUND}")
-if (${FTK_HAVE_PNETCDF})
-  message("      Include path:   ${PNETCDF_INCLUDE_DIR}")
-  message("      Library:        ${PNETCDF_LIBRARY}")
-endif ()
-message("    PNG:         ${FTK_USE_PNG} ${PNG_FOUND}")
-if (${FTK_HAVE_PNG})
-  message("      Library:   ${PNG_LIBRARY}")
-endif()
 message("    Qt5:         ${FTK_USE_Qt5} ${FTK_HAVE_QT5}")
 if (${FTK_HAVE_QT5})
   message("      Qt5OpenGL:  ${Qt5OpenGL_DIR}")

include/ftk/algorithms/hoshen_kopelman.hh

@@ -1,7 +1,7 @@
 #ifndef _FTK_CCL2D_HH
 #define _FTK_CCL2D_HH
 
-#include <ftk/ndarray.hh>
+#include <ndarray/ndarray.hh>
 
 namespace ftk {
 

include/ftk/basic/kd.hh

@@ -2,7 +2,7 @@
 #define _FTK_KD_HH
 
 #include <ftk/config.hh>
-#include <ftk/ndarray.hh>
+#include <ndarray/ndarray.hh>
 #include <vector>
 #include <list>