Skip to content

Commit ebbf528

Browse files
dalerobertsdaleroberts
authored
Merge pull request GeoscienceAustralia#290 from rogerfraser/1.2.9
1.2.9
2 parents a9bd7aa + aadcb27 commit ebbf528

File tree

4 files changed

+34
-28
lines changed

4 files changed

+34
-28
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cmake_install.cmake
88
*.so
99

1010
# ignore compiled dynadjust wrappers & binaries & documentation
11+
build_gcc/
1112
build/
1213
bin/
1314
doc/

‎dynadjust/CMakeLists.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,12 @@ if(OpenMP_CXX_FOUND)
283283
list(APPEND DNA_LIBRARIES ${OpenMP_CXX_LIBRARIES})
284284
else()
285285
# Linux and other Unix systems
286-
message(STATUS "Enabled OpenMP")
287-
add_compile_options(${OpenMP_CXX_FLAGS})
288-
add_link_options(${OpenMP_CXX_FLAGS})
289-
list(APPEND DNA_LIBRARIES ${OpenMP_CXX_LIBRARIES})
286+
if (NOT USE_MKL)
287+
message(STATUS "Enabled OpenMP")
288+
add_compile_options(${OpenMP_CXX_FLAGS})
289+
add_link_options(${OpenMP_CXX_FLAGS})
290+
list(APPEND DNA_LIBRARIES ${OpenMP_CXX_LIBRARIES})
291+
endif()
290292
endif()
291293
endif()
292294

‎dynadjust/include/config/dnaversion-stream.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ void output_version(T& stream, bool PAD=false)
8181
else
8282
stream << "Version: ";
8383
stream << __BINARY_VERSION__ << ", " << __BINARY_BUILDTYPE__ << " with " << __LINEAR_ALGEBRA_LIB__;
84+
#if defined(_OPENMP)
85+
stream << " (with OpenMP)";
86+
#endif
8487
}
8588

8689

‎resources/make_dynadjust_gcc.sh‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,11 @@ echo " "
304304
# determine whether to prepare cmake files with testing or not
305305
case ${_test} in
306306
0) # skip tests
307-
echo -e "cmake -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=$THIS_BUILD_TYPE ..\n"
308-
cmake -DBUILD_TESTING="OFF" -DCMAKE_BUILD_TYPE="$THIS_BUILD_TYPE" .. || exit 1;;
307+
echo -e "cmake -DBUILD_TESTING=OFF -DUSE_MKL=ON -DCMAKE_BUILD_TYPE=$THIS_BUILD_TYPE ..\n"
308+
cmake -DBUILD_TESTING="OFF" -DUSE_MKL=ON -DCMAKE_BUILD_TYPE="$THIS_BUILD_TYPE" .. || exit 1;;
309309
*) # run cmake tests with code coverage
310-
echo -e "cmake -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=$THIS_BUILD_TYPE ..\n"
311-
cmake -DBUILD_TESTING="ON" -DCMAKE_BUILD_TYPE="$THIS_BUILD_TYPE" .. || exit 1;;
310+
echo -e "cmake -DBUILD_TESTING=ON -DUSE_MKL=ON -DCMAKE_BUILD_TYPE=$THIS_BUILD_TYPE ..\n"
311+
cmake -DBUILD_TESTING="ON" -DUSE_MKL=ON -DCMAKE_BUILD_TYPE="$THIS_BUILD_TYPE" .. || exit 1;;
312312
esac
313313

314314
echo -e "\n==========================================================================="
@@ -401,66 +401,66 @@ else
401401

402402
echo "Copying libraries and binaries to $DYNADJUST_INSTALL_PATH ..."
403403

404-
if [[ ( -e "./bin/dynadjust" ) && ( "all" == "$_binary" || "$_binary" =~ "dynadjust" ) ]]; then
405-
sudo cp ./bin/dynadjust "$DYNADJUST_INSTALL_PATH/"
404+
if [[ ( -e "../../bin/dynadjust" ) && ( "all" == "$_binary" || "$_binary" =~ "dynadjust" ) ]]; then
405+
sudo cp ../../bin/dynadjust "$DYNADJUST_INSTALL_PATH/"
406406
ln -sf "$DYNADJUST_INSTALL_PATH/dynadjust" "$BIN_FOLDER_FULLPATH/dynadjust"
407407
sudo ln -sf "$DYNADJUST_INSTALL_PATH/dynadjust" /opt/dynadjust/dynadjust
408408
echo " - dynadjust"
409409
fi
410410

411-
if [[ ( -e "./bin/dnaadjust" ) && ( "all" == "$_binary" || "$_binary" =~ "adjust" ) ]]; then
412-
sudo cp ./bin/libdnaadjust.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
413-
sudo cp ./bin/dnaadjust "$DYNADJUST_INSTALL_PATH/"
411+
if [[ ( -e "../../bin/dnaadjust" ) && ( "all" == "$_binary" || "$_binary" =~ "adjust" ) ]]; then
412+
sudo cp ../../bin/libdnaadjust.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
413+
sudo cp ../../bin/dnaadjust "$DYNADJUST_INSTALL_PATH/"
414414
ln -sf "$DYNADJUST_INSTALL_PATH/dnaadjust" "$BIN_FOLDER_FULLPATH/dnaadjust"
415415
ln -sf "$DYNADJUST_INSTALL_PATH/libdnaadjust.$_lib_ext" "$BIN_FOLDER_FULLPATH/libdnaadjust.$_lib_ext"
416416
sudo ln -sf "$DYNADJUST_INSTALL_PATH/libdnaadjust.$_lib_ext" /opt/dynadjust/libdnaadjust.$_lib_ext
417417
sudo ln -sf "$DYNADJUST_INSTALL_PATH/dnaadjust" /opt/dynadjust/dnaadjust
418418
echo " - dnaadjust, libdnaadjust.$_lib_ext"
419419
fi
420420

421-
if [[ ( -e "./bin/dnaimport" ) && ( "all" == "$_binary" || "$_binary" =~ "import" ) ]]; then
422-
sudo cp ./bin/libdnaimport.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
423-
sudo cp ./bin/dnaimport "$DYNADJUST_INSTALL_PATH/"
421+
if [[ ( -e "../../bin/dnaimport" ) && ( "all" == "$_binary" || "$_binary" =~ "import" ) ]]; then
422+
sudo cp ../../bin/libdnaimport.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
423+
sudo cp ../../bin/dnaimport "$DYNADJUST_INSTALL_PATH/"
424424
ln -sf "$DYNADJUST_INSTALL_PATH/dnaimport" "$BIN_FOLDER_FULLPATH/dnaimport"
425425
ln -sf "$DYNADJUST_INSTALL_PATH/libdnaimport.$_lib_ext" "$BIN_FOLDER_FULLPATH/libdnaimport.$_lib_ext"
426426
sudo ln -sf "$DYNADJUST_INSTALL_PATH/libdnaimport.$_lib_ext" /opt/dynadjust/libdnaimport.$_lib_ext
427427
sudo ln -sf "$DYNADJUST_INSTALL_PATH/dnaimport" /opt/dynadjust/dnaimport
428428
echo " - dnaimport, libdnaimport.$_lib_ext"
429429
fi
430430

431-
if [[ ( -e "./bin/dnareftran" ) && ( "all" == "$_binary" || "$_binary" =~ "reftran" ) ]]; then
432-
sudo cp ./bin/libdnareftran.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
433-
sudo cp ./bin/dnareftran "$DYNADJUST_INSTALL_PATH/"
431+
if [[ ( -e "../../bin/dnareftran" ) && ( "all" == "$_binary" || "$_binary" =~ "reftran" ) ]]; then
432+
sudo cp ../../bin/libdnareftran.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
433+
sudo cp ../../bin/dnareftran "$DYNADJUST_INSTALL_PATH/"
434434
ln -sf "$DYNADJUST_INSTALL_PATH/dnareftran" "$BIN_FOLDER_FULLPATH/dnareftran"
435435
ln -sf "$DYNADJUST_INSTALL_PATH/libdnareftran.$_lib_ext" "$BIN_FOLDER_FULLPATH/libdnareftran.$_lib_ext"
436436
sudo ln -sf "$DYNADJUST_INSTALL_PATH/libdnareftran.$_lib_ext" /opt/dynadjust/libdnareftran.$_lib_ext
437437
sudo ln -sf "$DYNADJUST_INSTALL_PATH/dnareftran" /opt/dynadjust/dnareftran
438438
echo " - dnareftran, libdnareftran.$_lib_ext"
439439
fi
440440

441-
if [[ ( -e "./bin/dnageoid" ) && ( "all" == "$_binary" || "$_binary" =~ "geoid" ) ]]; then
442-
sudo cp ./bin/libdnageoid.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
443-
sudo cp ./bin/dnageoid "$DYNADJUST_INSTALL_PATH/"
441+
if [[ ( -e "../../bin/dnageoid" ) && ( "all" == "$_binary" || "$_binary" =~ "geoid" ) ]]; then
442+
sudo cp ../../bin/libdnageoid.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
443+
sudo cp ../../bin/dnageoid "$DYNADJUST_INSTALL_PATH/"
444444
ln -sf "$DYNADJUST_INSTALL_PATH/dnageoid" "$BIN_FOLDER_FULLPATH/dnageoid"
445445
ln -sf "$DYNADJUST_INSTALL_PATH/libdnageoid.$_lib_ext" "$BIN_FOLDER_FULLPATH/libdnageoid.$_lib_ext"
446446
sudo ln -sf "$DYNADJUST_INSTALL_PATH/libdnageoid.$_lib_ext" /opt/dynadjust/libdnageoid.$_lib_ext
447447
sudo ln -sf "$DYNADJUST_INSTALL_PATH/dnageoid" /opt/dynadjust/dnageoid
448448
echo " - dnageoid, libdnageoid.$_lib_ext"
449449
fi
450450

451-
if [[ ( -e "./bin/dnasegment" ) && ( "all" == "$_binary" || "$_binary" =~ "segment" ) ]]; then
452-
sudo cp ./bin/libdnasegment.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
453-
sudo cp ./bin/dnasegment "$DYNADJUST_INSTALL_PATH/"
451+
if [[ ( -e "../../bin/dnasegment" ) && ( "all" == "$_binary" || "$_binary" =~ "segment" ) ]]; then
452+
sudo cp ../../bin/libdnasegment.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
453+
sudo cp ../../bin/dnasegment "$DYNADJUST_INSTALL_PATH/"
454454
ln -sf "$DYNADJUST_INSTALL_PATH/dnasegment" "$BIN_FOLDER_FULLPATH/dnasegment"
455455
ln -sf "$DYNADJUST_INSTALL_PATH/libdnasegment.$_lib_ext" "$BIN_FOLDER_FULLPATH/libdnasegment.$_lib_ext"
456456
sudo ln -sf "$DYNADJUST_INSTALL_PATH/libdnasegment.$_lib_ext" /opt/dynadjust/libdnasegment.$_lib_ext
457457
sudo ln -sf "$DYNADJUST_INSTALL_PATH/dnasegment" /opt/dynadjust/dnasegment
458458
echo " - dnasegment, libdnasegment.$_lib_ext"
459459
fi
460460

461-
if [[ ( -e "./bin/dnaplot" ) && ( "all" == "$_binary" || "$_binary" =~ "plot" ) ]]; then
462-
sudo cp ./bin/libdnaplot.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
463-
sudo cp ./bin/dnaplot "$DYNADJUST_INSTALL_PATH/"
461+
if [[ ( -e "../../bin/dnaplot" ) && ( "all" == "$_binary" || "$_binary" =~ "plot" ) ]]; then
462+
sudo cp ../../bin/libdnaplot.$_lib_ext "$DYNADJUST_INSTALL_PATH/"
463+
sudo cp ../../bin/dnaplot "$DYNADJUST_INSTALL_PATH/"
464464
ln -sf "$DYNADJUST_INSTALL_PATH/dnaplot" "$BIN_FOLDER_FULLPATH/dnaplot"
465465
ln -sf "$DYNADJUST_INSTALL_PATH/libdnaplot.$_lib_ext" "$BIN_FOLDER_FULLPATH/libdnaplot.$_lib_ext"
466466
sudo ln -sf "$DYNADJUST_INSTALL_PATH/libdnaplot.$_lib_ext" /opt/dynadjust/libdnaplot.$_lib_ext

0 commit comments

Comments
 (0)