Skip to content

Commit 5155138

Browse files
committed
fix build issue with adios2
1 parent 8d7d2a0 commit 5155138

File tree

6 files changed

+17
-31
lines changed

6 files changed

+17
-31
lines changed

CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,11 @@ if (MGARD_ENABLE_SERIAL OR
111111
add_subdirectory (include/mgard-x/MDR)
112112
add_subdirectory (include/mgard-x/MDR-X)
113113
find_package(PkgConfig REQUIRED)
114-
find_package(ZSTD REQUIRED)
115-
114+
pkg_search_module(ZSTD REQUIRED IMPORTED_TARGET GLOBAL libzstd)
115+
if(ZSTD_FOUND)
116+
message(STATUS "Found ZSTD: ${ZSTD_LINK_LIBRARIES}")
117+
endif()
118+
116119
add_executable(mgard-x ${CMAKE_CURRENT_SOURCE_DIR}/src/mgard-x/Executables/mgard-x.cpp)
117120
target_link_libraries(mgard-x mgard-library ${CMAKE_DL_LIBS})
118121
target_include_directories(mgard-x PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -258,6 +261,10 @@ set(MGARD_FILE_FORMAT_HPP "${MGARD_FILE_FORMAT_DIR}/mgard.pb.h")
258261
set(MGARD_FILE_FORMAT_CPP "${MGARD_FILE_FORMAT_DIR}/mgard.pb.cc")
259262

260263
pkg_search_module(protobuf REQUIRED IMPORTED_TARGET GLOBAL protobuf>=3.0.0)
264+
if(protobuf_FOUND)
265+
message(STATUS "Found protobuf: ${protobuf_LINK_LIBRARIES}")
266+
endif()
267+
261268
find_program(PROTOC NAMES "protoc" REQUIRED)
262269

263270
file(MAKE_DIRECTORY "${MGARD_FILE_FORMAT_DIR}")
@@ -340,12 +347,7 @@ target_link_libraries(mgard-library PUBLIC ZLIB::ZLIB)
340347

341348
if(ZSTD_FOUND)
342349
target_compile_definitions(mgard-library PUBLIC MGARD_ZSTD)
343-
if(ZSTD_FOUND_BY_CMAKE)
344-
target_link_libraries(mgard-library PUBLIC zstd::libzstd_shared)
345-
endif()
346-
if(ZSTD_FOUND_BY_PKGCONFIG)
347-
target_link_libraries(mgard-library PUBLIC PkgConfig::ZSTD)
348-
endif()
350+
target_link_libraries(mgard-library PUBLIC PkgConfig::ZSTD)
349351
endif()
350352

351353
if(MGARD_ENABLE_CUDA)

build_scripts/build_mgard_cuda_ampere.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ mkdir -p ${mgard_x_build_dir}
7979
cmake -S ${mgard_x_src_dir} -B ${mgard_x_build_dir} \
8080
-DCMAKE_PREFIX_PATH="${nvcomp_install_dir};${zstd_install_dir}/lib/cmake/zstd;${protobuf_install_dir}"\
8181
-DMGARD_ENABLE_CUDA=ON\
82-
-DCMAKE_CUDA_ARCHITECTURES="86"\
82+
-DCMAKE_CUDA_ARCHITECTURES="80"\
8383
-DMGARD_ENABLE_DOCS=OFF\
8484
-DCMAKE_BUILD_TYPE=Release\
8585
-DCMAKE_INSTALL_PREFIX=${mgard_x_install_dir}

cmake/FindZSTD.cmake

Lines changed: 0 additions & 19 deletions
This file was deleted.

cmake/mgard-config.cmake.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ if(@ZLIB_FOUND@)
77
list(APPEND REQUIRED_VARS ZLIB_FOUND)
88
endif()
99

10-
if(@zstd_FOUND@)
11-
find_dependency(zstd)
12-
list(APPEND REQUIRED_VARS zstd_FOUND)
10+
if(@ZSTD_FOUND@)
11+
find_package(PkgConfig REQUIRED)
12+
pkg_search_module(ZSTD IMPORTED_TARGET GLOBAL libzstd)
13+
list(APPEND REQUIRED_VARS ZSTD_FOUND)
1314
endif()
1415

1516
if(@NVCOMP_FOUND@)

include/mgard-x/Config/Config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ struct Config {
2222
enum lossless_type lossless;
2323
int reorder;
2424
int log_level;
25+
bool prefetch;
2526
bool auto_pin_host_buffers;
2627
SIZE max_larget_level;
2728
SIZE max_memory_footprint;

src/mgard-x/Config/Config.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Config::Config() {
2525
normalize_coordinates = false;
2626
lossless = lossless_type::Huffman;
2727
reorder = 0;
28+
prefetch = false;
2829
log_level = log::ERR;
2930
max_larget_level = std::numeric_limits<SIZE>::max(); // no limit
3031
auto_pin_host_buffers = true;

0 commit comments

Comments
 (0)