Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@ jobs:
-o phloem-${{ github.ref_name }}.tar.gz \
HEAD

- name: Create full tarball (with thirdparty)
run: |
git archive --format=tar.gz \
--prefix=phloem-${{ github.ref_name }}/ \
-o phloem-${{ github.ref_name }}-full.tar.gz \
HEAD \
$(git submodule foreach --quiet 'git archive --prefix=$displaypath/ HEAD')

- name: Create GitHub Release
uses: softprops/action-gh-release@v3
with:
Expand Down
11 changes: 11 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ else()
"Or add -DBLT_SOURCE_DIR=/path/to/blt to your CMake command." )
endif()
endif()

if(DEFINED CMAKE_INSTALL_MANDIR)
set(_MANDIR_WAS_SET TRUE)
endif()

include(${BLT_SOURCE_DIR}/SetupBLT.cmake)
include(GNUInstallDirs)

Expand Down Expand Up @@ -146,3 +151,9 @@ if(DOCS)
COMMENT "Building all documentation"
)
endif()

if(_MANDIR_WAS_SET AND EXISTS ${CMAKE_SOURCE_DIR}/share/man/man1)
install(DIRECTORY share/man/man1
DESTINATION ${CMAKE_INSTALL_MANDIR}
FILES_MATCHING PATTERN "*.1")
endif()
2 changes: 1 addition & 1 deletion containerfiles/flux/el10/host-config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set(CMAKE_C_COMPILER "/usr/bin/gcc" CACHE PATH "")
set(CMAKE_CXX_COMPILER "/usr/bin/g++" CACHE PATH "")

# Fortran support
set(ENABLE_FORTRAN ON CACHE BOOL "")
set(ENABLE_FORTRAN OFF CACHE BOOL "")
set(CMAKE_Fortran_COMPILER "/usr/bin/gfortran" CACHE PATH "")
#_blt_tutorial_compiler_config_end

Expand Down
22 changes: 14 additions & 8 deletions var/spack_repo/phloem/packages/phloem/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
)
from spack_repo.builtin.build_systems.cuda import CudaPackage
from spack_repo.builtin.build_systems.rocm import ROCmPackage
from spack_repo.builtin.packages.blt.package import llnl_link_helpers

from spack.package import *


class Phloem(CachedCMakePackage, CudaPackage, ROCmPackage):
"""A suite of MPI benchmarks with Umpire memory allocation."""

Expand All @@ -28,6 +29,8 @@ class Phloem(CachedCMakePackage, CudaPackage, ROCmPackage):
depends_on("umpire")
depends_on("mpi")

variant("man", default=True, description="Install manual pages")

with when("+rocm"):
for arch_ in ROCmPackage.amdgpu_targets:
depends_on(f"umpire+rocm amdgpu_target={arch_}", when=f"amdgpu_target={arch_}")
Expand All @@ -42,7 +45,6 @@ class Phloem(CachedCMakePackage, CudaPackage, ROCmPackage):
depends_on("c", type="build")
depends_on("cxx", type="build")


def initconfig_mpi_entries(self):
spec = self.spec
entries = super().initconfig_mpi_entries()
Expand All @@ -53,12 +55,16 @@ def initconfig_mpi_entries(self):
def cmake_args(self):
args = super().cmake_args()

args.extend([
self.define_from_variant("ENABLE_HIP", "rocm"),
self.define_from_variant("ENABLE_CUDA", "cuda"),
self.define("BLT_SOURCE_DIR", self.spec["blt"].prefix),
])
if "+rocm" in self.spec and self.spec.satisfies("^cray-mpich"):
args.extend(
[
self.define_from_variant("ENABLE_HIP", "rocm"),
self.define_from_variant("ENABLE_CUDA", "cuda"),
self.define("BLT_SOURCE_DIR", self.spec["blt"].prefix),
]
)
if self.spec.satisfies("+man"):
args.append(self.define("CMAKE_INSTALL_MANDIR", self.prefix.man))
if self.spec.satisfies("+rocm") and self.spec.satisfies("^cray-mpich"):
# Append to existing MPI link flags. does not appear influential...
mpi_link_flags = self.spec["mpi"].libs.link_flags
mpi_link_flags += "-lmpi_gtl_hsa"
Expand Down
Loading