Skip to content

Fix error where makefile is unable to find omp.h #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SeanGolez merged 2 commits into from
Feb 18, 2025
Merged

Fix error where makefile is unable to find omp.h #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
594a32d
Fix directory_iterator namespace error, update version, and change ma…
SeanGolez Feb 14, 2025
ddd9f9c
fix indentation
SeanGolez Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,24 @@ list( APPEND PepSIRF_LINK_LIBS
)

if(OpenMP_FOUND)
message( "OpenMP enabled" )
list( APPEND PepSIRF_LINK_LIBS OpenMP::OpenMP_CXX )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp")
add_definitions( -DENABLE_OPENMP )
message("OpenMP enabled")

if(APPLE)
# Get libomp filepath
execute_process(COMMAND brew --prefix libomp OUTPUT_VARIABLE BREW_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -I${BREW_PREFIX}/include")
list(APPEND PepSIRF_LINK_LIBS "${BREW_PREFIX}/lib/libomp.dylib")
else()
list(APPEND PepSIRF_LINK_LIBS OpenMP::OpenMP_CXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp")
endif()

# Define OpenMP macro
add_definitions(-DENABLE_OPENMP)

else()
message( "WARNING: OpenMP not found, parallelism disabled." )
message("WARNING: OpenMP not found, parallelism disabled.")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas -Wno-unused-value")
endif()

Expand Down
2 changes: 1 addition & 1 deletion include/modules/core/pepsirf_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef PEPSIRF_VERSION_HH_INCLUDED
#define PEPSIRF_VERSION_HH_INCLUDED

#define PEPSIRF_VERSION "1.6.0"
#define PEPSIRF_VERSION "1.7.0"

#endif
3 changes: 2 additions & 1 deletion src/modules/deconv/module_deconv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/range/adaptor/transformed.hpp>
#include <boost/range/iterator_range.hpp>
#include <boost/filesystem.hpp>
#include <algorithm>
#include <type_traits>

Expand Down Expand Up @@ -67,7 +68,7 @@ void module_deconv::run(options *opts)
);
}

auto in_dir_iter = fs_tools::directory_iterator(input_base);
auto in_dir_iter = boost::filesystem::directory_iterator(input_base);

for (auto& input_f : boost::make_iterator_range(in_dir_iter, {}))
{
Expand Down