Skip to content

Commit

Permalink
conda forge build fixes (#1063)
Browse files Browse the repository at this point in the history
* improve tarball gen script
* blt mpi interface target flags fix
* update changelog
  • Loading branch information
cyrush committed Jan 9, 2023
1 parent 003c657 commit 57114a3
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s

### Fixed

#### General
- Build fixes for Conda Forge (mpi -fallow-argument-mismatch clang protection)

#### Relay
- Fixed a directory creation bug in `relay::io::blueprint::{save_mesh|write_mesh}` that occurred with sparse topologies with no domains on rank 0.
- Fixed a bug in `relay::io::blueprint::{save_mesh|write_mesh}` with the `suffix=cycle` option that could cause int max to erroneously be used as the cycle number in the output directory.
Expand Down
4 changes: 2 additions & 2 deletions scripts/gen_release_tarball.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Project developers. See top-level LICENSE AND COPYRIGHT files for dates and
# other details. No copyright assignment is required to contribute to Conduit.

import sys
import subprocess
import json
from optparse import OptionParser
Expand All @@ -22,11 +23,10 @@ def parse_args():
def main():
opts = parse_args()
print(json.dumps(opts,indent=2))
cmd = "scripts/git_archive_all.py --prefix conduit-v{0} conduit-v{0}-src-with-blt.tar.gz".format(opts["ver"])
cmd = "{0} scripts/git_archive_all.py --prefix conduit-v{1} conduit-v{1}-src-with-blt.tar.gz".format(sys.executable,opts["ver"])
print("[sexe: {0}]".format(cmd))
subprocess.call(cmd,shell=True)



if __name__ == "__main__":
main()
21 changes: 21 additions & 0 deletions src/cmake/SetupBLT.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,27 @@ if(ENABLE_MPI)
set(conduit_blt_mpi_deps "" CACHE STRING "")
endif()
endif()
#
# In some cases (mpich?) -fallow-argument-mismatch will be
# reported as a needed MPI flag for fortran.
# BLT fuses all MPI compiler flags into one big bunch.
# (It does not differentiate between C and fortran flags)
#
# -fallow-argument-mismatch is a fortran compiler flag that makes clang
# very unhappy, and this will cause blt's mpi smoke test to fail to build
# with clang.
#
# Conduit does not use mpi fortran, so we strip this flag if it exists.
#
# blt's mpi target is called "mpi"
if(TARGET mpi)
# check and strip interface compile opts
get_target_property(_mpi_iface_compile_opts mpi INTERFACE_COMPILE_OPTIONS)
if(_mpi_iface_compile_opts)
list(REMOVE_ITEM _mpi_iface_compile_opts "-fallow-argument-mismatch")
set_target_properties(mpi PROPERTIES INTERFACE_COMPILE_OPTIONS "${_mpi_iface_compile_opts}")
endif()
endif()
endif()

################################################################
Expand Down

0 comments on commit 57114a3

Please sign in to comment.