test PR (DONOT merge)

.github/workflows/ci-cmake_pytests.yml

@@ -31,7 +31,8 @@ jobs:
       shell: bash -l {0}
       run: |
         mamba install _openmp_mutex=*=*_llvm cmake make boost git compilers numpy mkl mkl-include mkl-service pybind11 libblas=*=*mkl beartype
-        mamba install gcovr gtest
+        python -m pip install gcovr
+        mamba install gtest
 
     - name: CPU info
       shell: bash -l {0}

.github/workflows/ci-cmake_tests.yml

@@ -35,7 +35,8 @@ jobs:
       shell: bash -l {0}
       run: |
         mamba install _openmp_mutex=*=*_llvm cmake make boost git compilers numpy mkl mkl-include mkl-service pybind11 libblas=*=*mkl beartype
-        mamba install gcovr gtest
+        python -m pip install gcovr
+        mamba install gtest
         mamba install pytest pytest-cov
 
     - name: CPU info

.github/workflows/conda_build_macos.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - dev-master
 
   workflow_dispatch:
 

CMakeLists.txt

@@ -19,7 +19,6 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-# set(CMAKE_CXX_EXTENSIONS OFF)
 message(STATUS " Generator: ${CMAKE_GENERATOR}")
 message(STATUS " Build Target: ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 message(STATUS " Installation Prefix: ${CMAKE_INSTALL_PREFIX}")
@@ -85,7 +84,6 @@ option(BUILD_DOC "Build API docuemntation" OFF)
 option(USE_HPTT "Build Cytnx with HPTT" OFF)
 option(RUN_TESTS "Run Cytnx tests" OFF)
 option(USE_CUTT "Build Cytnx with CUTT" OFF)
-option(USE_MAGMA "Build Cytnx with MAGMA (requires CUDA)" ON)
 option(USE_CUTENSOR "Build Cytnx with CuTensor (requires CUDA)" ON)
 option(USE_CUQUANTUM "Build Cytnx with CUQuantum (requires CUDA)" ON)
 
@@ -96,6 +94,10 @@ option(DEV_MODE "Build testing dev_test.cpp with cytnx" OFF)
 # #####################################################################
 project(CYTNX VERSION ${CYTNX_VERSION} LANGUAGES CXX C)
 
+# C++ uses link-time optimization anyway; this enables additionally -flto=auto,
+# for parallel compilation
+#set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+
 add_library(cytnx STATIC)
 set_property(TARGET cytnx PROPERTY C_VISIBILITY_PRESET hidden)
 set_property(TARGET cytnx PROPERTY VISIBILITY_INLINES_HIDDEN ON)
@@ -115,20 +117,9 @@ target_include_directories(cytnx SYSTEM
   ${Boost_INCLUDE_DIRS}
 )
 
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0 -Wno-c++11-narrowing -w")
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0 -w -fsized-deallocation -fsanitize=address")
-
 target_compile_options(cytnx PUBLIC -Wformat=0 -w -fsized-deallocation)
-
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0 -w -fsized-deallocation -diag-disable=10441")
-
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY")
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION")
 target_compile_features(cytnx PUBLIC cxx_std_17)
 
-# target_compile_definitions(cytnx PUBLIC _LIBCPP_DISABLE_AVAILABILITY)
-# target_compile_definitions(cytnx PUBLIC _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
-# set_property(TARGET cytnx PROPERTY CXX_STANDARD 11)
 add_subdirectory(src)
 
 if(USE_DEBUG)
@@ -138,21 +129,14 @@ if(USE_DEBUG)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
 endif()
 
-if(RUN_TESTS)
-  enable_testing()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fprofile-arcs -ftest-coverage")
-  target_link_libraries(cytnx PUBLIC "-lgcov --coverage")
-  add_subdirectory(tests)
-  #add_subdirectory(bm_tests)
-endif()
-
 include(GNUInstallDirs)
 
 if(USE_ICPC)
   target_compile_definitions(cytnx PUBLIC UNI_ICPC)
   # This option is to disable the warning of icpc
   target_compile_options(cytnx PUBLIC -diag-disable=10441)
-  # This option is to maintain consistency of the floating point operation, also try to improve the performance
+  # This option is to maintain consistency of the floating point operation, also
+  # try to improve the performance
   target_compile_options(cytnx PUBLIC -fp-model consistent -fimf-use-svml)
 endif()
 
@@ -203,36 +187,24 @@ endif() # Backend torch
 # ## Get Gtest & benchmark
 # #####################################################################
 if(RUN_TESTS)
-  find_package(GTest REQUIRED)
-  #find_package(benchmark REQUIRED)
-
-
-  #include(FetchContent)
-  #FetchContent_Declare(
-  #  googletest
-  #  URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
-  #)
+  # Include CTest explicitly to suppress the error that DartConfiguration.tcl
+  # is not found
+  include(CTest)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fprofile-arcs -ftest-coverage")
+  target_link_libraries(cytnx PUBLIC "-lgcov --coverage")
+  # "-fopenmp" flag is appended to CMAKE_CXX_FLAGS in CytnxBKNDCMakeLists.cmake.
+  # To make the executalbe targets defined under tests/ link OpenMP correctly,
+  # tests/ must be added after including CytnxBKNDCMakeLists.cmake.
+  add_subdirectory(tests)
+  #add_subdirectory(bm_tests)
 
-  # For Windows: Prevent overriding the parent project's compiler/linker settings
   set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
-  #FetchContent_Declare(
-  #  googlebenchmark
-  #  GIT_REPOSITORY https://github.com/google/benchmark.git
-  #  GIT_TAG v1.7.1) # need master for benchmark::benchmark
-  #set(BENCHMARK_ENABLE_TESTING off) # to suppress benchmark internal tests
-
-  #FetchContent_MakeAvailable(
-  #  googletest
-  #  googlebenchmark)
 endif()
 
 # #######
 # ## Python wrapper
 # #######
 IF(BUILD_PYTHON)
-  # PythonInterp is removed in newer version of cmake
-  # find_package(PythonInterp REQUIRED)
   find_package (Python COMPONENTS Interpreter Development)
   find_package(pybind11 REQUIRED)
 
@@ -402,7 +374,6 @@ message(STATUS "    CXX Flags: ${CMAKE_CXX_FLAGS}")
 message(STATUS "    BLAS and LAPACK Libraries: ${LAPACK_LIBRARIES}")
 message(STATUS "    Link libraries: ${CYTNX_LINK_Libs}")
 
-# # this need to append into the linkflags.tmp
 FILE(APPEND "${CMAKE_BINARY_DIR}/linkflags.tmp" "${LAPACK_LIBRARIES}\n" "")
 FILE(APPEND "${CMAKE_BINARY_DIR}/cxxflags.tmp" "${CMAKE_CXX_FLAGS}\n" "")
 

CytnxBKNDCMakeLists.cmake

@@ -154,7 +154,8 @@ if(USE_CUDA)
         include_directories(${install_dir}/include)
         message(STATUS "cutt install dir: ${install_dir}")
         add_dependencies(cytnx cutt)
-        set_property(TARGET cytnx PROPERTY CUDA_ARCHITECTURES 52 53 60 61 62 70 72 75 80 86)
+        # set_property(TARGET cytnx PROPERTY CUDA_ARCHITECTURES 52 53 60 61 62 70 72 75 80 86)
+        set_property(TARGET cytnx PROPERTY CUDA_ARCHITECTURES native)
         target_compile_definitions(cytnx PRIVATE UNI_CUTT)
         target_link_libraries(cytnx PUBLIC ${install_dir}/lib/libcutt.a)
         # relocate cutt
@@ -168,26 +169,6 @@ if(USE_CUDA)
 
     endif()
 
-    if(USE_MAGMA)
-        find_package( MAGMA REQUIRED)
-        if(NOT MAGMA_FOUND)
-            message(FATAL_ERROR "MAGMA not found!")
-        endif()
-        message(STATUS "^^^magma root aft: ${MAGMA_ROOT}")
-        message(STATUS "^^^magma inc dr: ${MAGMA_INCLUDE_DIRS}")
-        message(STATUS "^^^magma lib dr: ${MAGMA_LIBRARY_DIRS}")
-        message(STATUS "^^^magma libs: ${MAGMA_LIBRARIES}")
-        #add_dependencies(cytnx magma)
-        target_include_directories(cytnx PRIVATE ${MAGMA_INCLUDE_DIRS})
-        target_compile_definitions(cytnx PRIVATE UNI_MAGMA)
-        target_link_libraries(cytnx PUBLIC ${MAGMA_LIBRARIES})
-
-        message( STATUS "Build with MAGMA: YES")
-        FILE(APPEND "${CMAKE_BINARY_DIR}/cxxflags.tmp" "-DUNI_MAGMA\n" "")
-        FILE(APPEND "${CMAKE_BINARY_DIR}/cxxflags.tmp" "-I${MAGMA_INCLUDE_DIRS}\n" "")
-        FILE(APPEND "${CMAKE_BINARY_DIR}/linkflags.tmp" "${MAGMA_LIBRARIES} -ldl\n" "") # use > to indicate special rt processing
-        message( STATUS "MAGMA: libdir:${MAGMA_LIBRARY_DIRS} incdir:${MAGMA_INCLUDE_DIRS} libs:${MAGMA_LIBRARIES}")
-    endif()
 
     message( STATUS " Build CUDA Support: YES")
     message( STATUS "  - CUDA Version: ${CUDA_VERSION_STRING}")
@@ -280,10 +261,6 @@ if(USE_OMP)
 else()
     message( STATUS " Build OMP Support: NO")
 
-    if(USE_MKL)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
-    endif()
-
     if(USE_HPTT)
         find_package( OpenMP )
         if ( OPENMP_FOUND )