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

MPI: Experimental platform tag #4073

Closed
wants to merge 5 commits into from
Closed

MPI: Experimental platform tag #4073

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3104b78
MPI: Experimental platform tag
vchuravy Dec 17, 2021
0946119
fixup BBB
vchuravy Dec 17, 2021
4c5599a
filter OS correctly
vchuravy Dec 17, 2021
12cbca5
use MPIABI
vchuravy Dec 18, 2021
c26ee64
Use branches with fixes
vchuravy Dec 18, 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
28 changes: 14 additions & 14 deletions .ci/Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

[[BinaryBuilder]]
deps = ["ArgParse", "BinaryBuilderBase", "Dates", "Downloads", "GitHub", "HTTP", "JLD2", "JSON", "LibGit2", "Libdl", "Logging", "LoggingExtras", "ObjectFile", "OutputCollectors", "Pkg", "PkgLicenses", "ProgressMeter", "REPL", "Random", "Registrator", "RegistryTools", "SHA", "Scratch", "Sockets", "UUIDs", "ghr_jll"]
git-tree-sha1 = "3412f6ef0e3dc3f4d4eda931f94f17a8cd9d1d3e"
repo-rev = "master"
git-tree-sha1 = "7ac8bbcb42151546dd4ec7d141529a9f2316e731"
repo-rev = "vc/augmented_platform"
repo-url = "https://github.com/JuliaPackaging/BinaryBuilder.jl.git"
uuid = "12aac903-9f7c-5d81-afc2-d9565ea332ae"
version = "0.4.4"

[[BinaryBuilderBase]]
deps = ["CodecZlib", "Downloads", "InteractiveUtils", "JSON", "LibGit2", "Libdl", "Logging", "OutputCollectors", "Pkg", "Random", "SHA", "Scratch", "SimpleBufferStream", "TOML", "Tar", "UUIDs", "p7zip_jll", "pigz_jll"]
git-tree-sha1 = "6ea13175e9a30512805c9bf1599a628b397eac60"
git-tree-sha1 = "66c3eb2778203fb29254cfa1ba5a780c528f389f"
repo-rev = "master"
repo-url = "https://github.com/JuliaPackaging/BinaryBuilderBase.jl.git"
uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
version = "1.1.2"
version = "1.2.0"

[[CodecZlib]]
deps = ["TranscodingStreams", "Zlib_jll"]
Expand All @@ -50,9 +50,9 @@ version = "0.7.0"

[[Compat]]
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
git-tree-sha1 = "dce3e3fea680869eaa0b774b2e8343e9ff442313"
git-tree-sha1 = "44c37b4636bc54afac5c574d2d02b625349d6582"
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
version = "3.40.0"
version = "3.41.0"

[[DataAPI]]
git-tree-sha1 = "cc70b17275652eb47bc9e5f81635981f13cea5c8"
Expand All @@ -61,9 +61,9 @@ version = "1.9.0"

[[DataStructures]]
deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
git-tree-sha1 = "7d9d316f04214f7efdbb6398d545446e246eff02"
git-tree-sha1 = "3daef5523dd2e769dad2365274f760ff5f282c7d"
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
version = "0.18.10"
version = "0.18.11"

[[DataValueInterfaces]]
git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
Expand Down Expand Up @@ -317,15 +317,15 @@ version = "1.2.9"

[[RegistryTools]]
deps = ["AutoHashEquals", "LibGit2", "Pkg", "SHA", "UUIDs"]
git-tree-sha1 = "e5bc4ecbdd55f030b9f2644aa4a625f34a868ea0"
git-tree-sha1 = "7ba3c65d4f40a399e5a2f0ec5abc89de871604e5"
uuid = "d1eb7eb1-105f-429d-abf5-b0f65cb9e2c4"
version = "1.6.0"
version = "1.7.0"

[[Requires]]
deps = ["UUIDs"]
git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621"
git-tree-sha1 = "8f82019e525f4d5c669692772a6f4b0a58b06a6a"
uuid = "ae029012-a4dd-5104-9daa-d747884805df"
version = "1.1.3"
version = "1.2.0"

[[SHA]]
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
Expand Down Expand Up @@ -383,9 +383,9 @@ version = "1.0.1"

[[Tables]]
deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]
git-tree-sha1 = "fed34d0e71b91734bf0a7e10eb1bb05296ddbcd0"
git-tree-sha1 = "bb1064c9a84c52e277f1096cf41434b675cd368b"
uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
version = "1.6.0"
version = "1.6.1"

[[Tar]]
deps = ["ArgTools", "SHA"]
Expand Down
33 changes: 30 additions & 3 deletions L/LAMMPS/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Note that this script can accept some limited command-line arguments, run
# `julia build_tarballs.jl --help` to see a usage message.
using BinaryBuilder, Pkg
using Base.BinaryPlatforms

name = "LAMMPS"
version = v"1.0.1" # Equivalent to 2020-10-29
Expand Down Expand Up @@ -58,12 +59,38 @@ products = [
ExecutableProduct("lmp", :lmp),
]

mpi_abis = (
(:mpich, PackageSpec(name="MPICH_jll"), "") ,
(:msmpi, PackageSpec(name="MicrosoftMPI_jll"), ""),
(:mpitrampoline, PackageSpec(name="MPItrampoline_jll"), "2")
)

# Dependencies that must be installed before this package can be built
dependencies = [
Dependency(PackageSpec(name="CompilerSupportLibraries_jll")),
Dependency(PackageSpec(name="MPItrampoline_jll"), compat="2"),
Dependency(PackageSpec(name="MicrosoftMPI_jll"))
# Dependency(PackageSpec(name="MPIPlatformTag")),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@staticfloat @simonbyrne

I am debating if this should be MPI.jl or a tiny single preference package.

]

all_platforms = AbstractPlatform[]
for (abi, pkg, compat) in mpi_abis
pkg_platforms = deepcopy(platforms)
vchuravy marked this conversation as resolved.
Show resolved Hide resolved
foreach(pkg_platforms) do p
BinaryPlatforms.add_tag!(p.tags, "mpi", string(abi))
end
append!(all_platforms, pkg_platforms)
push!(dependencies, Dependency(pkg; compat, platforms=pkg_platforms))
end

augmented_platform_block = """
using Base.BinaryPlatforms
# using MPIPlatformTag

function augmented_platform(platform)
vchuravy marked this conversation as resolved.
Show resolved Hide resolved
abi = :mpich
# abi = MPIPlatformTag.get_abi()
BinaryPlatforms.add_tag!(platform.tags, "mpi", string(abi))
return platform
end
"""
# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6", preferred_gcc_version=v"8")
build_tarballs(ARGS, name, version, sources, script, all_platforms, products, dependencies; julia_compat="1.6", preferred_gcc_version=v"8")