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

[PETSc] Attempt to rebuild with good include files (and don't rename libpetsc) #3801

Merged
merged 20 commits into from
Mar 9, 2022
Merged

[PETSc] Attempt to rebuild with good include files (and don't rename libpetsc) #3801

Changes from 11 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
345779f
attempt to rebuild with good include files (and don't rename libpetsc)
Oct 23, 2021
b289066
fix symlink name
Oct 23, 2021
ff50a5b
add target to directory
Oct 23, 2021
f9a79e0
typo
Oct 23, 2021
5fe010c
Inject version
Oct 25, 2021
139a35c
Merge pull request #1 from jeremiahpslewis/Wimmerer-petsc_changes
Oct 25, 2021
892ab65
make check now passes
Oct 25, 2021
4e2d35a
Remove symlinks, add LDFLAGS
Oct 25, 2021
af03beb
so to dll on win
Oct 26, 2021
1f98c2f
search bin for windows libs
Oct 27, 2021
4b36955
use $libdir in products.
Oct 27, 2021
3919ea3
Update P/PETSc/build_tarballs.jl
giordano Oct 27, 2021
4d8c7f4
Update P/PETSc/build_tarballs.jl
giordano Oct 27, 2021
f5f4434
rename things
rayegun Mar 4, 2022
5d04c50
rm mingw specific mv cmd
rayegun Mar 5, 2022
224a420
match original better
rayegun Mar 8, 2022
9bbba08
version bump
rayegun Mar 8, 2022
7425907
Update build_tarballs.jl
giordano Mar 8, 2022
fc8cfbf
fix windows
rayegun Mar 9, 2022
2b4eda4
Merge branch 'petsc_changes' of https://github.com/Wimmerer/Yggdrasil…
rayegun Mar 9, 2022
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
55 changes: 19 additions & 36 deletions P/PETSc/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = v"3.15.2"
# Collection of sources required to build PETSc. Avoid using the git repository, it will
# require building SOWING which fails in all non-linux platforms.
sources = [
ArchiveSource("https://www.mcs.anl.gov/petsc/mirror/release-snapshots/petsc-3.15.2.tar.gz",
ArchiveSource("https://www.mcs.anl.gov/petsc/mirror/release-snapshots/petsc-$(version).tar.gz",
rayegun marked this conversation as resolved.
Show resolved Hide resolved
"3b10c19c69fc42e01a38132668724a01f1da56f5c353105cd28f1120cc9041d8"),
DirectorySource("./bundled"),
]
Expand All @@ -24,7 +24,7 @@ if [[ "${target}" == *-mingw* ]]; then
else
MPI_LIBS="[${libdir}/libmpifort.${dlext},${libdir}/libmpi.${dlext}]"
fi

mkdir $libdir/petsc
build_petsc()
{

Expand All @@ -33,19 +33,19 @@ build_petsc()
else
USE_INT64=0
fi

./configure --prefix=${prefix} \
mkdir $libdir/petsc/${1}_${2}_${3}
./configure --prefix=${libdir}/petsc/${1}_${2}_${3} \
CC=${CC} \
FC=${FC} \
CXX=${CXX} \
COPTFLAGS='-O3' \
CXXOPTFLAGS='-O3' \
CFLAGS='-fno-stack-protector' \
LDFLAGS="-L${libdir}" \
FOPTFLAGS='-O3' \
--with-64-bit-indices=${USE_INT64} \
--with-debugging=0 \
--with-batch \
--PETSC_ARCH=${target}_${1}_${2}_${3} \
--with-blaslapack-lib=$BLAS_LAPACK_LIB \
--with-blaslapack-suffix="" \
--known-64-bit-blas-indices=0 \
Expand All @@ -54,7 +54,8 @@ build_petsc()
--with-mpi-include="${includedir}" \
--with-sowing=0 \
--with-precision=${1} \
--with-scalar-type=${2}
--with-scalar-type=${2} \
--PETSC_ARCH=${target}_${1}_${2}_${3}

if [[ "${target}" == *-mingw* ]]; then
export CPPFLAGS="-Dpetsc_EXPORTS"
Expand All @@ -64,29 +65,10 @@ build_petsc()
fi

make -j${nproc} \
PETSC_DIR="${PWD}" \
PETSC_ARCH="${target}_${1}_${2}_${3}" \
CPPFLAGS="${CPPFLAGS}" \
CFLAGS="${CFLAGS}" \
FFLAGS="${FFLAGS}" \
DEST_DIR="${prefix}" \
all

make PETSC_DIR=$PWD PETSC_ARCH=${target}_${1}_${2}_${3} DEST_DIR=$prefix install

# add suffix to library name
if [[ "${target}" == *-mingw* ]]; then
# changing the extension from so to dll.
mv ${prefix}/lib/libpetsc.so.*.*.* "${libdir}/libpetsc_${1}_${2}_${3}.${dlext}"
elif [[ "${target}" == *-apple* ]]; then
mv ${prefix}/lib/libpetsc.*.*.*.${dlext} "${libdir}/libpetsc_${1}_${2}_${3}.${dlext}"
else
mv ${prefix}/lib/libpetsc.${dlext}.*.*.* "${libdir}/libpetsc_${1}_${2}_${3}.${dlext}"
fi
# Remove useless links
rm ${prefix}/lib/libpetsc.*
# Remove duplicated file
rm ${prefix}/lib/pkgconfig/PETSc.pc
FFLAGS="${FFLAGS}"
make install
}

build_petsc double real Int32
Expand All @@ -103,15 +85,16 @@ build_petsc single complex Int64
platforms = expand_gfortran_versions(supported_platforms(exclude=[Platform("i686", "windows")]))

products = [
LibraryProduct("libpetsc_double_real_Int32", :libpetsc), # Current default build
LibraryProduct("libpetsc_double_real_Int64", :libpetsc_Float64_Real_Int64),
LibraryProduct("libpetsc_single_real_Int64", :libpetsc_Float32_Real_Int64),
LibraryProduct("libpetsc_double_complex_Int64", :libpetsc_Float64_Complex_Int64),
LibraryProduct("libpetsc_single_complex_Int64", :libpetsc_Float32_Complex_Int64),
LibraryProduct("libpetsc_double_real_Int32", :libpetsc_Float64_Real_Int32),
LibraryProduct("libpetsc_single_real_Int32", :libpetsc_Float32_Real_Int32),
LibraryProduct("libpetsc_double_complex_Int32", :libpetsc_Float64_Complex_Int32),
LibraryProduct("libpetsc_single_complex_Int32", :libpetsc_Float32_Complex_Int32),
# Current default build, equivalent to Float64_Real_Int32
LibraryProduct("libpetsc", :libpetsc, "$libdir/petsc/double_real_Int32/lib")
giordano marked this conversation as resolved.
Show resolved Hide resolved
LibraryProduct("libpetsc", :libpetsc_Float64_Real_Int32, "$libdir/petsc/double_real_Int32/lib")
LibraryProduct("libpetsc", :libpetsc_Float64_Real_Int64, "$libdir/petsc/double_real_Int64/lib")
LibraryProduct("libpetsc", :libpetsc_Float32_Real_Int64, "$libdir/petsc/single_real_Int64/lib")
LibraryProduct("libpetsc", :libpetsc_Float64_Complex_Int64, "$libdir/petsc/double_complex_Int64/lib")
LibraryProduct("libpetsc", :libpetsc_Float32_Complex_Int64, "$libdir/petsc/single_complex_Int64/lib")
LibraryProduct("libpetsc", :libpetsc_Float32_Real_Int32, "$libdir/petsc/single_real_Int32/lib")
LibraryProduct("libpetsc", :libpetsc_Float64_Complex_Int32, "$libdir/petsc/double_complex_Int32/lib")
LibraryProduct("libpetsc", :libpetsc_Float32_Complex_Int32, "$libdir/petsc/single_complex_Int32/lib")
giordano marked this conversation as resolved.
Show resolved Hide resolved
]

dependencies = [
Expand Down