Skip to content
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

Jump to bottom

Boost/1.72.0/mpi #3959

Merged
merged 3 commits into from
Jul 13, 2021
Merged

Boost/1.72.0/mpi #3959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8fbfc9
Enables Boost MPI when requested (boost:without_mpi=False)
oleurodecision Sep 2, 2020
f060ca6
Adds Boost:MPI configuration check when enabled
oleurodecision Sep 2, 2020
4e8a0ba
Applies patch to all version
oleurodecision Jul 5, 2021
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
16 changes: 16 additions & 0 deletions recipes/boost/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ patches:
base_path: "source_subfolder"
- patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_mpi_check.patch"
base_path: "source_subfolder"
1.70.0:
- patch_file: "patches/0001-beast-fix-moved-from-executor.patch"
base_path: "source_subfolder"
Expand All @@ -73,6 +75,8 @@ patches:
base_path: "source_subfolder"
- patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_mpi_check.patch"
base_path: "source_subfolder"
1.71.0:
- patch_file: "patches/bcp_namespace_issues_1_71.patch"
base_path: "source_subfolder"
Expand All @@ -86,6 +90,8 @@ patches:
base_path: "source_subfolder"
- patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_mpi_check.patch"
base_path: "source_subfolder"
1.72.0:
- patch_file: "patches/bcp_namespace_issues_1_72.patch"
base_path: "source_subfolder"
Expand All @@ -103,27 +109,37 @@ patches:
base_path: "source_subfolder"
- patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_mpi_check.patch"
base_path: "source_subfolder"
1.73.0:
- patch_file: "patches/boost_build_qcc_fix_debug_build_parameter.patch"
base_path: "source_subfolder"
- patch_file: "patches/python_base_prefix.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_mpi_check.patch"
base_path: "source_subfolder"
1.74.0:
- patch_file: "patches/boost_build_qcc_fix_debug_build_parameter_since_1_74.patch"
base_path: "source_subfolder"
- patch_file: "patches/python_base_prefix_since_1_74.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_mpi_check.patch"
base_path: "source_subfolder"
1.75.0:
- patch_file: "patches/boost_build_qcc_fix_debug_build_parameter_since_1_74.patch"
base_path: "source_subfolder"
- patch_file: "patches/python_base_prefix_since_1_74.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_mpi_check.patch"
base_path: "source_subfolder"
1.76.0:
- patch_file: "patches/boost_locale_fail_on_missing_backend.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_mpi_check.patch"
base_path: "source_subfolder"
4 changes: 4 additions & 0 deletions recipes/boost/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,6 +1143,10 @@ def create_library_config(deps_name, name):
includes=self._python_includes,
libraries=self._python_libraries)

if not self.options.without_mpi:
# https://www.boost.org/doc/libs/1_72_0/doc/html/mpi/getting_started.html
contents += '\nusing mpi ;'

# Specify here the toolset with the binary if present if don't empty parameter :
contents += '\nusing "%s" : %s : ' % (self._toolset, self._toolset_version)

Expand Down
24 changes: 24 additions & 0 deletions recipes/boost/all/patches/boost_mpi_check.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff -ru a/tools/build/src/tools/mpi.jam b/tools/build/src/tools/mpi.jam
--- a/tools/build/src/tools/mpi.jam 2019-12-10 01:20:16.000000000 +0100
+++ b/tools/build/src/tools/mpi.jam 2020-09-02 13:17:22.942349254 +0200
@@ -66,6 +66,8 @@
import type ;
import path ;

+import errors ;
+
# Make this module a project
project.initialize $(__name__) ;
project mpi ;
@@ -539,6 +541,11 @@
# Set up the "mpi" alias
alias mpi : : : : $(options) ;
}
+
+ if ! $(.configured)
+ {
+ errors.user-error "MPI not configured" ;
+ }
}

# States whether MPI has bee configured