Stable/proteus #974
Open
Stable/proteus #974
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: examples/proteus.linux2.yaml
…xcept for scorec and zoltan.yaml
Conflicts: examples/proteus.Darwin.yaml examples/proteus.garnet.gnu.yaml examples/proteus.linux2.yaml pkgs/scorec.yaml
Cekees/kitchen sink
This uses my customized mpi compiler scripts, but the changes were pushed to the system mpi scripts and supposedly upsream to SGI. For future reference the commented out defSysLibs line below will break the petsc config: > ############################################################################# > # Modified defSysLibs to prevent compiler warnings when "-c" option is used. > # 08/06/2015 - Brent Andersen. See LiveTime #177141 message @ 08/06/15 10:13. > #defSysLibs="-lpthread /usr/lib64/libcpuset.so.1 /usr/lib64/libbitmask.so.1" > defSysLibs="-lpthread -L/usr/lib64 -lcpuset -lbitmask" > #############################################################################
Conflicts: examples/proteus.Cygwin.yaml examples/proteus.Darwin.yaml examples/proteus.garnet.gnu.yaml examples/proteus.linux2.yaml
modified: examples/proteus.linux2.yaml modified: pkgs/h5py.yaml modified: pkgs/julia.yaml modified: pkgs/numpy/numpy.yaml modified: pkgs/openblas.yaml modified: pkgs/py.yaml new file: pkgs/pybind11.yaml modified: pkgs/pytables/pytables.yaml modified: pkgs/pytest-cov.yaml modified: pkgs/pytest.yaml modified: pkgs/python/python.yaml modified: pkgs/scipy/scipy.yaml
chrono pkg to stable version 3.0.0
* test removing several packages * Started commenting packages, created optional package section, turn on matplotlib * Moved commented packages to optional list * try removing more packages, prepare to revert * turn openjpeg back on * turned recordtypes back on * Moved commented out packages into optional section
* updated scorec pkg to get 2D reconstruction capability
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@certik @vbraun and @johannesring I'd like to merge this in to master, but I'm concerned that my version upgrades to some of the basic packages will give your stacks trouble. In an ideal world the PR's would have come in on a per package basis, but they've accumulated in the stable/proteus branch. This PR are is tied to a hashdist PR that may take more discussion so I wanted to give you a heads up on the simpler review of many of the package updates in this hashstack PR.