Prepare for MGARD 1.7.0 release

.gitignore

@@ -54,3 +54,14 @@ CMakeSettings.json
 
 #'Tags' file.
 tags
+
+# Out-of-source build/install trees (this repo builds into ./build-*/ and installs into ./install-*/)
+/build-*/
+/install-*/
+# Editor / CLI artifacts
+/.vscode/
+/vscode_cli.tar.gz
+
+# Slurm submission scripts (local scheduler jobs, not part of the source tree)
+*.sbatch
+*.slurm

CMakeLists.txt

@@ -11,11 +11,11 @@ endif()
 list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
 set(MGARD_VERSION_MAJOR "1")
-set(MGARD_VERSION_MINOR "6")
+set(MGARD_VERSION_MINOR "7")
 set(MGARD_VERSION_PATCH "0")
 
 set(MGARD_FILE_VERSION_MAJOR "1")
-set(MGARD_FILE_VERSION_MINOR "0")
+set(MGARD_FILE_VERSION_MINOR "7")
 set(MGARD_FILE_VERSION_PATCH "0")
 
 project(
@@ -37,9 +37,8 @@ option(MGARD_ENABLE_CUDA "Enable CUDA support" OFF)
 option(MGARD_ENABLE_SERIAL "Enable SERIAL support" ON)
 option(MGARD_ENABLE_HIP "Enable HIP support" OFF)
 option(MGARD_ENABLE_SYCL "Enable SYCL support" OFF)
-option(MGARD_ENABLE_LEGACY_CUDA "Enable legacy CUDA support" OFF)
 option(MGARD_ENABLE_AUTO_TUNING "Enable auto tuning" OFF)
-option(MGARD_ENABLE_MDR "Enable MDR" OFF)
+option(MGARD_ENABLE_MDR "Enable MDR" ON)
 option(MGARD_ENABLE_EXTERNAL_COMPRESSOR "Enable external compressor" OFF)
 
 option(MGARD_ENABLE_CLI "Build executable." OFF)
@@ -140,6 +139,22 @@ if (MGARD_ENABLE_SERIAL OR
     target_include_directories(mdr-x PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
                                               $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
     install(TARGETS mdr-x)
+    add_executable(mdr-x-qoi ${CMAKE_CURRENT_SOURCE_DIR}/src/mgard-x/Executables/mdr-x-qoi.cpp)
+    target_link_libraries(mdr-x-qoi mgard-library  ${CMAKE_DL_LIBS})
+    target_include_directories(mdr-x-qoi PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+                                              $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
+    install(TARGETS mdr-x-qoi)
+    find_package(MPI REQUIRED)
+    add_executable(pmdr-x-qoi ${CMAKE_CURRENT_SOURCE_DIR}/src/mgard-x/Executables/pmdr-x-qoi.cpp)
+    target_link_libraries(pmdr-x-qoi mgard-library MPI::MPI_CXX ${CMAKE_DL_LIBS})
+    target_include_directories(pmdr-x-qoi PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+                                              $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
+    install(TARGETS pmdr-x-qoi)
+    add_executable(pmdr-x-qoi-io ${CMAKE_CURRENT_SOURCE_DIR}/src/mgard-x/Executables/pmdr-x-qoi-io.cpp)
+    target_link_libraries(pmdr-x-qoi-io mgard-library MPI::MPI_CXX ${CMAKE_DL_LIBS})
+    target_include_directories(pmdr-x-qoi-io PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+                                              $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
+    install(TARGETS pmdr-x-qoi-io)
   endif()
 endif()
 
@@ -163,7 +178,6 @@ if(MGARD_ENABLE_CUDA)
       set(CMAKE_CUDA_ARCHITECTURES 70)
   endif()
 
-  find_package(nvcomp REQUIRED)
   find_package(CUDAToolkit REQUIRED)
 
   target_compile_definitions(mgard-library PUBLIC MGARD_ENABLE_CUDA)
@@ -175,34 +189,11 @@ if(MGARD_ENABLE_CUDA)
   set_source_files_properties(${MGARD_X_CUDA_SRC} PROPERTIES LANGUAGE CUDA)
 endif()
 
-if (MGARD_ENABLE_LEGACY_CUDA)
-  enable_language(CUDA)
-  set(CMAKE_CUDA_STANDARD_REQUIRED TRUE)
-  if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
-      set(CMAKE_CUDA_ARCHITECTURES 70)
-  endif()
-
-  find_package(nvcomp REQUIRED)
-  find_package(CUDAToolkit REQUIRED)
-
-  add_subdirectory (src/cuda)
-  add_subdirectory (include/cuda)
-  add_executable(mgard-gpu ${CMAKE_CURRENT_SOURCE_DIR}/src/cuda/MgardCudaExec.cpp)
-    target_link_libraries(mgard-gpu mgard-library  ${CMAKE_DL_LIBS})
-    target_include_directories(mgard-gpu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-                                                $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
-
-  target_compile_definitions(mgard-library PUBLIC MGARD_ENABLE_LEGACY_CUDA)
-  set (CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-relaxed-constexpr -w")
-
-  set (MGARD_X_SEPARATE_COMPILE_COMPILATION_OPTION 
-       CUDA_SEPARABLE_COMPILATION ON)
-
-  install(TARGETS mgard-gpu)
-endif()
-
-if (MGARD_ENABLE_HIP) 
-  find_package(HIP REQUIRED)
+if (MGARD_ENABLE_HIP)
+  # __syncwarp(), used by SubGroup<HIP>::sync() for wavefront-level
+  # synchronization, is opt-in before ROCm 7.0 and default-on from 7.0
+  # onward -- require 7.0 so it needs no HIP_ENABLE_WARP_SYNC_BUILTINS define.
+  find_package(HIP 7.0 REQUIRED)
   enable_language(HIP)
   target_compile_definitions(mgard-library PUBLIC MGARD_ENABLE_HIP)
   set (CMAKE_HIP_FLAGS  "${CMAKE_HIP_FLAGS} -w")
@@ -234,13 +225,7 @@ find_package(ZLIB REQUIRED)
 
 find_package(PkgConfig REQUIRED)
 
-set(
-  MGARD_LIBRARY_CPP
-        src/compress.cpp
-        src/compress_internal.cpp
-  src/compressors.cpp
-  src/format.cpp
-)
+add_subdirectory(src/mgard)
 
 set(MAXIMUM_DIMENSION 4 CACHE STRING "Maximum supported dimension for self-describing decompression.")
 
@@ -366,11 +351,7 @@ if(ZSTD_FOUND)
 endif()
 
 if(MGARD_ENABLE_CUDA)
-  target_link_libraries(mgard-library PUBLIC nvcomp::nvcomp CUDA::cudart)
-endif()
-
-if(MGARD_ENABLE_LEGACY_CUDA)
-  target_link_libraries(mgard-library PUBLIC nvcomp::nvcomp CUDA::cudart)
+  target_link_libraries(mgard-library PUBLIC CUDA::cudart)
 endif()
 
 if(MGARD_ENABLE_OPENMP)
@@ -406,7 +387,7 @@ install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mgard")
 install(FILES "${MGARD_FILE_FORMAT_HPP}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mgard/${MGARD_FILE_FORMAT_INCLUDESUBDIR_COMPONENT}")
 
 if(MGARD_ENABLE_UNSTRUCTURED)
-	add_subdirectory("src/unstructured")
+	add_subdirectory("src/mgard/unstructured")
 endif()
 
 if(MGARD_ENABLE_BENCHMARKS)
@@ -464,7 +445,7 @@ install(EXPORT mgard-targets NAMESPACE mgard::
 )
 
 if(MGARD_ENABLE_CLI)
-	add_subdirectory("src/cli")
+	add_subdirectory("src/mgard/cli")
 endif()
 
 message(STATUS "")
@@ -503,12 +484,6 @@ if (MGARD_ENABLE_HIP)
 endif()
 message(STATUS "SYCL:        ${MGARD_ENABLE_SYCL}")
 list(POP_BACK CMAKE_MESSAGE_INDENT)
-message(STATUS "LEGACY CUDA:   ${MGARD_ENABLE_LEGACY_CUDA}")
-if (MGARD_ENABLE_LEGACY_CUDA)
-  list(APPEND CMAKE_MESSAGE_INDENT "  ")
-  message(STATUS "CUDA Arch: ${CMAKE_CUDA_ARCHITECTURES}")
-  list(POP_BACK CMAKE_MESSAGE_INDENT)
-endif()
 message(STATUS "auto tuning:   ${MGARD_ENABLE_AUTO_TUNING}")
 message(STATUS "MDR:           ${MGARD_ENABLE_MDR}")
 message(STATUS "timing:        ${MGARD_ENABLE_TIMING}")

LICENSE

@@ -175,7 +175,8 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2019 Brown University
+   Copyright 2019-2026 Oak Ridge National Laboratory
+   Copyright 2019-2026 Brown University
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.