From d4c1af34e5a3f680b6552277d32686abe6f9f681 Mon Sep 17 00:00:00 2001 From: sdlzx Date: Mon, 27 Dec 2021 23:11:39 +0800 Subject: [PATCH] Remove unused mpi script --- boost.spec | 272 ++--------------------------------------------------- 1 file changed, 9 insertions(+), 263 deletions(-) diff --git a/boost.spec b/boost.spec index 3398d79..c87f090 100644 --- a/boost.spec +++ b/boost.spec @@ -2,14 +2,12 @@ %global boost_examplesdir __tmp_examplesdir %global version_enc 1_78_0 -%bcond_with mpich -%bcond_with openmpi %bcond_with tests %bcond_with docs_generated Name: boost Version: 1.78.0 -Release: 4 +Release: 5 Summary: The free peer-reviewed portable C++ source libraries License: Boost Software License 1.0 URL: http://www.boost.org @@ -271,125 +269,6 @@ Requires: boost-devel = %{version}-%{release} %description examples This package contains example source files distributed with boost. -%if 0%{with openmpi} -%package openmpi -Summary: Run-time component of Boost.MPI library -BuildRequires: openmpi-devel -Requires: boost-serialization%{?_isa} = %{version}-%{release} - -%description openmpi - -Run-time support for Boost.MPI-OpenMPI, a library providing a clean C++ -API over the OpenMPI implementation of MPI. - -%package openmpi-devel -Summary: Shared library symbolic links for Boost.MPI -Requires: boost-devel%{?_isa} = %{version}-%{release} -Requires: boost-openmpi%{?_isa} = %{version}-%{release} -Requires: boost-graph-openmpi%{?_isa} = %{version}-%{release} - -%description openmpi-devel - -Devel package for Boost.MPI-OpenMPI, a library providing a clean C++ -API over the OpenMPI implementation of MPI. - -%package openmpi-python3 -Summary: Python 3 run-time component of Boost.MPI library -Requires: boost-openmpi%{?_isa} = %{version}-%{release} -Requires: boost-python3%{?_isa} = %{version}-%{release} -Requires: boost-serialization%{?_isa} = %{version}-%{release} -Requires: python3-openmpi%{?_isa} - -%description openmpi-python3 - -Python 3 support for Boost.MPI-OpenMPI, a library providing a clean C++ -API over the OpenMPI implementation of MPI. - -%package openmpi-python3-devel -Summary: Shared library symbolic links for Boost.MPI Python 3 component -Requires: boost-devel%{?_isa} = %{version}-%{release} -Requires: boost-python3-devel%{?_isa} = %{version}-%{release} -Requires: boost-openmpi-devel%{?_isa} = %{version}-%{release} -Requires: boost-openmpi-python3%{?_isa} = %{version}-%{release} - -%description openmpi-python3-devel - -Devel package for the Python 3 interface of Boost.MPI-OpenMPI, a library -providing a clean C++ API over the OpenMPI implementation of MPI. - -%package graph-openmpi -Summary: Run-time component of parallel boost graph library -Requires: boost-openmpi%{?_isa} = %{version}-%{release} -Requires: boost-serialization%{?_isa} = %{version}-%{release} - -%description graph-openmpi - -Run-time support for the Parallel BGL graph library. The interface and -graph components are generic, in the same sense as the Standard -Template Library (STL). This libraries in this package use OpenMPI -back-end to do the parallel work. -%endif - -%if 0%{with mpich} -%package mpich -Summary: Run-time component of Boost.MPI library -BuildRequires: mpich-devel -Requires: boost-serialization%{?_isa} = %{version}-%{release} - -%description mpich - -Run-time support for Boost.MPI-MPICH, a library providing a clean C++ -API over the MPICH implementation of MPI. - -%package mpich-devel -Summary: Shared library symbolic links for Boost.MPI -Requires: boost-devel%{?_isa} = %{version}-%{release} -Requires: boost-mpich%{?_isa} = %{version}-%{release} -Requires: boost-graph-mpich%{?_isa} = %{version}-%{release} - -%description mpich-devel - -Devel package for Boost.MPI-MPICH, a library providing a clean C++ -API over the MPICH implementation of MPI. - -%package mpich-python3 -Summary: Python 3 run-time component of Boost.MPI library -Requires: boost-mpich%{?_isa} = %{version}-%{release} -Requires: boost-python3%{?_isa} = %{version}-%{release} -Requires: boost-serialization%{?_isa} = %{version}-%{release} -Requires: python3-mpich%{?_isa} - -%description mpich-python3 - -Python 3 support for Boost.MPI-MPICH, a library providing a clean C++ -API over the MPICH implementation of MPI. - -%package mpich-python3-devel -Summary: Shared library symbolic links for Boost.MPI Python 3 component -Requires: boost-devel%{?_isa} = %{version}-%{release} -Requires: boost-python3-devel%{?_isa} = %{version}-%{release} -Requires: boost-mpich-devel%{?_isa} = %{version}-%{release} -Requires: boost-mpich-python3%{?_isa} = %{version}-%{release} - -%description mpich-python3-devel - -Devel package for the Python 3 interface of Boost.MPI-MPICH, a library -providing a clean C++ API over the MPICH implementation of MPI. - -%package graph-mpich -Summary: Run-time component of parallel boost graph library -Requires: boost-mpich%{?_isa} = %{version}-%{release} -Requires: boost-serialization%{?_isa} = %{version}-%{release} - -%description graph-mpich - -Run-time support for the Parallel BGL graph library. The interface and -graph components are generic, in the same sense as the Standard -Template Library (STL). This libraries in this package use MPICH -back-end to do the parallel work. - -%endif - %package build Summary: Cross platform build system for C++ projects Requires: boost-jam @@ -437,53 +316,20 @@ local RPM_OPT_FLAGS = [ os.environ RPM_OPT_FLAGS ] ; local RPM_LD_FLAGS = [ os.environ RPM_LD_FLAGS ] ; using gcc : : : $(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) ; -%if 0%{with openmpi} || 0%{with mpich} -using mpi ; -%endif EOF cat >> ./tools/build/src/user-config.jam << EOF using python : %{python3_version} : /usr/bin/python3 : /usr/include/python%{python3_version}${PYTHON3_ABIFLAGS} : : : ; EOF -./bootstrap.sh --with-toolset=gcc --with-icu +./bootstrap.sh %define opt_build -d+2 -q %{?_smp_mflags} --no-cmake-config %define opt_feature variant=release threading=multi debug-symbols=on pch=off %define opt_python python=%{python3_version} %define b2_options %{opt_build} %{opt_feature} %{opt_python} -echo ============================= build serial ================== -./b2 %{b2_options} \ - --without-mpi --without-graph_parallel --build-dir=serial \ - stage - -%if %{with openmpi} || %{with mpich} -module purge ||: -%endif - -%if %{with openmpi} -%{_openmpi_load} - -echo ============================= build $MPI_COMPILER ================== -./b2 %{b2_options} \ - --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \ - stage - -%{_openmpi_unload} -export PATH=/bin${PATH:+:}$PATH -%endif - -%if %{with mpich} -%{_mpich_load} - -echo ============================= build $MPI_COMPILER ================== -./b2 %{b2_options} \ - --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \ - stage - -%{_mpich_unload} -export PATH=/bin${PATH:+:}$PATH -%endif +echo ============================= build libraries ================== +./b2 %{b2_options} --without-mpi --without-graph_parallel echo ============================= build Boost.Build ================== (cd tools/build @@ -493,56 +339,9 @@ echo ============================= build Boost.Build ================== : %install -%if 0%{with openmpi} || 0%{with mpich} -module purge ||: -%endif - - -%if 0%{with openmpi} -%{_openmpi_load} - -echo ============================= install $MPI_COMPILER ================== -./b2 %{b2_options} \ - --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \ - --stagedir=${RPM_BUILD_ROOT}${MPI_HOME} \ - install - -mkdir -p ${RPM_BUILD_ROOT}%{python3_sitearch}/openmpi/boost -touch ${RPM_BUILD_ROOT}%{python3_sitearch}/openmpi/boost/__init__.py -mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/boost-python%{python3_version}/mpi.so \ - ${RPM_BUILD_ROOT}%{python3_sitearch}/openmpi/boost/ - -rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}* -rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_numpy* - -%{_openmpi_unload} -export PATH=/bin${PATH:+:}$PATH -%endif - -%if 0%{with mpich} -%{_mpich_load} - -echo ============================= install $MPI_COMPILER ================== -./b2 %{b2_options} \ - --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \ - --stagedir=${RPM_BUILD_ROOT}${MPI_HOME} \ - install - -mkdir -p ${RPM_BUILD_ROOT}%{python3_sitearch}/mpich/boost -touch ${RPM_BUILD_ROOT}%{python3_sitearch}/mpich/boost/__init__.py -mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/boost-python%{python3_version}/mpi.so \ - ${RPM_BUILD_ROOT}%{python3_sitearch}/mpich/boost/ - -rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}* -rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_numpy* - -%{_mpich_unload} -export PATH=/bin${PATH:+:}$PATH -%endif - -echo ============================= install serial ================== +echo ============================= install libraries ================== ./b2 %{b2_options} \ - --without-mpi --without-graph_parallel --build-dir=serial \ + --without-mpi --without-graph_parallel \ --prefix=$RPM_BUILD_ROOT%{_prefix} \ --libdir=$RPM_BUILD_ROOT%{_libdir} \ install @@ -769,66 +568,10 @@ fi %{_includedir}/%{name} %{_libdir}/*.so %{_libdir}/*.a -%if 0%{with mpich} -%{_libdir}/mpich/lib/*.a -%endif -%if 0%{with openmpi} -%{_libdir}/openmpi/lib/*.a -%endif %files examples %doc %{boost_examplesdir}/* -%if 0%{with openmpi} - -%files openmpi -%license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/libboost_mpi.so.%{version} - -%files openmpi-devel -%license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/libboost_mpi.so -%{_libdir}/openmpi/lib/libboost_graph_parallel.so - -%files openmpi-python3 -%license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/libboost_mpi_python%{python3_version_nodots}.so.%{version} -%{python3_sitearch}/openmpi/boost/ - -%files openmpi-python3-devel -%license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/libboost_mpi_python%{python3_version_nodots}.so - -%files graph-openmpi -%license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/libboost_graph_parallel.so.%{version} -%endif - -%if 0%{with mpich} -%files mpich -%license LICENSE_1_0.txt -%{_libdir}/mpich/lib/libboost_mpi.so.%{version} - -%files mpich-devel -%license LICENSE_1_0.txt -%{_libdir}/mpich/lib/libboost_mpi.so -%{_libdir}/mpich/lib/libboost_graph_parallel.so - -%files mpich-python3 -%license LICENSE_1_0.txt -%{_libdir}/mpich/lib/libboost_mpi_python%{python3_version_nodots}.so.%{version} -%{python3_sitearch}/mpich/boost/ - -%files mpich-python3-devel -%license LICENSE_1_0.txt -%{_libdir}/mpich/lib/libboost_mpi_python%{python3_version_nodots}.so - -%files graph-mpich -%license LICENSE_1_0.txt -%{_libdir}/mpich/lib/libboost_graph_parallel.so.%{version} - -%endif - %files build %license LICENSE_1_0.txt %{_datadir}/boost-build/ @@ -844,6 +587,9 @@ fi %{_mandir}/man1/bjam.1* %changelog +* Mon Dec 27 2021 sdlzx - 1.78.0-5 +- Remove mpi related scripts + * Fri Dec 24 2021 sdlzx - 1.78.0-4 - Update package info - Reference: https://www.boost.org/doc/libs/1_78_0/ -- Gitee