Build with CXX11 ABI only

Signed-off-by: Gigon Bae <[email protected]>

Author: gigony

CMakeLists.txt

@@ -96,10 +96,6 @@ option(CUCIM_STATIC_GDS "Use static cufile library" OFF)
 option(CUCIM_SUPPORT_CUDA "Support CUDA" ON)
 option(CUCIM_SUPPORT_NVTX "Support NVTX" ON)
 
-# Setup CXX11 ABI
-# : Adds CXX11 ABI definition to the compiler command line for targets in the current directory,
-#   whether added before or after this command is invoked, and for the ones in sub-directories added after.
-add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) # TODO: create two library, one with CXX11 ABI and one without it.
 
 ################################################################################
 # Define basic dependencies

cpp/CMakeLists.txt

@@ -139,7 +139,6 @@ target_compile_definitions(${CUCIM_PACKAGE_NAME}
         CUCIM_STATIC_GDS=$<BOOL:${CUCIM_STATIC_GDS}>
         CUCIM_SUPPORT_CUDA=$<BOOL:${CUCIM_SUPPORT_CUDA}>
         CUCIM_SUPPORT_NVTX=$<BOOL:${CUCIM_SUPPORT_NVTX}>
-        _GLIBCXX_USE_CXX11_ABI=0  # TODO: create two library, one with CXX11 ABI and one without it.
 )
 
 # Link libraries

cpp/include/cucim/io/format/image_format.h

@@ -119,10 +119,6 @@ class EXPORT_VISIBLE ImageMetadata
     std::array<uint8_t, IMAGE_METADATA_BUFFER_SIZE> buffer_{};
     std::pmr::monotonic_buffer_resource res_{ buffer_.data(), sizeof(buffer_) };
 
-// manylinux2014 requires gcc4-compatible libstdcxx-abi(gcc is configured with
-// '--with-default-libstdcxx-abi=gcc4-compatible', https://gcc.gnu.org/onlinedocs/libstdc++/manual/configure.html) which
-// forces to set _GLIBCXX_USE_CXX11_ABI=0 so std::pmr::string wouldn't be available on CentOS 7.
-#if _GLIBCXX_USE_CXX11_ABI
     std::pmr::string dims_{ &res_ };
     std::pmr::vector<int64_t> shape_{ &res_ };
     std::pmr::vector<std::string_view> channel_names_{ &res_ };
@@ -137,22 +133,7 @@ class EXPORT_VISIBLE ImageMetadata
     std::pmr::vector<uint32_t> level_tile_sizes_{ &res_ };
 
     std::pmr::vector<std::string_view> image_names_{ &res_ };
-#else
-    std::string dims_;
-    std::pmr::vector<int64_t> shape_{ &res_ };
-    std::pmr::vector<std::string_view> channel_names_{ &res_ };
-    std::pmr::vector<float> spacing_{ &res_ };
-    std::pmr::vector<std::string_view> spacing_units_{ &res_ };
-    std::pmr::vector<float> origin_{ &res_ };
-    std::pmr::vector<float> direction_{ &res_ };
-    std::string coord_sys_;
 
-    std::pmr::vector<int64_t> level_dimensions_{ &res_ };
-    std::pmr::vector<float> level_downsamples_{ &res_ };
-    std::pmr::vector<uint32_t> level_tile_sizes_{ &res_ };
-
-    std::pmr::vector<std::string_view> image_names_{ &res_ };
-#endif
     // Memory for raw_data and json_data needs to be created with cucim_malloc();
 };
 

cpp/plugins/cucim.kit.cumed/CMakeLists.txt

@@ -105,10 +105,6 @@ include(ExternalProject)
 # Options
 ################################################################################
 
-# Setup CXX11 ABI
-# : Adds CXX11 ABI definition to the compiler command line for targets in the current directory,
-#   whether added before or after this command is invoked, and for the ones in sub-directories added after.
-add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) # TODO: create two library, one with CXX11 ABI and one without it.
 
 ################################################################################
 # Define dependencies

cpp/plugins/cucim.kit.cuslide/CMakeLists.txt

@@ -105,10 +105,6 @@ include(ExternalProject)
 # Options
 ################################################################################
 
-# Setup CXX11 ABI
-# : Adds CXX11 ABI definition to the compiler command line for targets in the current directory,
-#   whether added before or after this command is invoked, and for the ones in sub-directories added after.
-add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) # TODO: create two library, one with CXX11 ABI and one without it.
 
 ################################################################################
 # Define dependencies

python/CMakeLists.txt

@@ -89,10 +89,6 @@ include(ExternalProject)
 # Options
 ################################################################################
 
-# Setup CXX11 ABI
-# : Adds CXX11 ABI definition to the compiler command line for targets in the current directory,
-#   whether added before or after this command is invoked, and for the ones in sub-directories added after.
-add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) # TODO: create two library, one with CXX11 ABI and one without it.
 
 ################################################################################
 # Define dependencies