ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-04-08 22:37:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

Remove hard-coded paths

Browse Source
This commit is contained in:
Matthias Hochsteger 2024-05-03 18:38:16 +02:00
parent 17a945f0b4
commit 63d3df9cd9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/core/ng_mpi_wrapper.cpp
View File

@ -32,7 +32,7 @@ void InitMPI(std::filesystem::path mpi_lib_path, std::filesystem::path ng_libs_d
get_version = GetSymbol<get_version_handle>("MPI_Get_library_version"); get_version = GetSymbol<get_version_handle>("MPI_Get_library_version");
} catch (std::runtime_error &e) { } catch (std::runtime_error &e) {
cout << IM(3) << "MPI not loaded" << endl; cout << IM(3) << "MPI not loaded" << endl;
mpi_lib = std::make_unique<SharedLibrary>("/usr/lib/libmpi.so", mpi_lib = std::make_unique<SharedLibrary>(mpi_lib_path,
std::nullopt, true); std::nullopt, true);
mpi_init = mpi_lib->GetSymbol<init_handle>("MPI_Init"); mpi_init = mpi_lib->GetSymbol<init_handle>("MPI_Init");
mpi_initialized = mpi_initialized =
@ -57,10 +57,10 @@ void InitMPI(std::filesystem::path mpi_lib_path, std::filesystem::path ng_libs_d
std::string libname = ""; std::string libname = "";
if (mpi_library_version.substr(0, 8) == "Open MPI") { if (mpi_library_version.substr(0, 8) == "Open MPI") {
cout << IM(3) << "Have Open MPI" << endl; cout << IM(3) << "Have Open MPI" << endl;
libname = "/opt/netgen/lib/libng_openmpi.so"; libname = std::string("libng_openmpi") + NETGEN_SHARED_LIBRARY_SUFFIX;
} else if (mpi_library_version.substr(0, 5) == "MPICH") { } else if (mpi_library_version.substr(0, 5) == "MPICH") {
cout << IM(3) << "Have MPICH" << endl; cout << IM(3) << "Have MPICH" << endl;
libname = "/opt/netgen/lib/libng_mpich.so"; libname = std::string("libng_mpich.so") + NETGEN_SHARED_LIBRARY_SUFFIX;
} else } else
cout << IM(3) << "Unknown MPI" << endl; cout << IM(3) << "Unknown MPI" << endl;