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.

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

Stable/proteus #974

Open
wants to merge 478 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
478 commits
Select commit Hold shift + click to select a range
d14708f
Merge remote-tracking branch 'origin/add_pcs_api' into proteus_update
cekees Jul 21, 2015
d51a47b
add pcs_api
cekees Jul 21, 2015
d4830df
Merge branch 'proteus_update' into add_location
cekees Jul 21, 2015
296966f
Merge branch 'add_jupyter-pip' into proteus_update
cekees Jul 22, 2015
1331d75
updated jupyter-pip and pythreejs
cekees Jul 22, 2015
8f03b1a
Merge remote-tracking branch 'origin/master' into stable/spirit
cekees Jul 28, 2015
9317ce7
updated cython version and petsc preconfig options
cekees Aug 2, 2015
b911fb2
Attempt at merge with master hashstack accepting all master changes e…
Aug 10, 2015
3622f35
Still testing merged compilation.
Aug 10, 2015
bd0058e
Merged stack can compile with test_merge branch
Aug 10, 2015
33a2671
Merge remote-tracking branch 'origin/master' into cekees/kitchen_sink
cekees Sep 8, 2015
f811615
added scorec
cekees Sep 8, 2015
0cf6e3e
Merge remote-tracking branch 'erdc-cm/scorec' into cekees/kitchen_sink
cekees Sep 8, 2015
9a0d5f9
updated scorec tools
cekees Sep 8, 2015
c4dfe12
Merge pull request #33 from erdc-cm/cekees/kitchen_sink
cekees Sep 8, 2015
93776df
updated petsc script on spirit.afrl
cekees Sep 9, 2015
409b871
Merge remote-tracking branch 'origin/master' into cekees/kitchen_sink
cekees Sep 10, 2015
2eaa563
Merge remote-tracking branch 'origin/master' into proteus_update
cekees Sep 10, 2015
c0db028
Merge branch 'add_location' into cekees/kitchen_sink
cekees Sep 10, 2015
f576310
removed old clawpack spec
cekees Sep 10, 2015
36605cc
fixed conflicts
cekees Sep 10, 2015
c0c1a52
fixed gitignore
cekees Sep 10, 2015
7c3d13b
formating
cekees Sep 10, 2015
0355f7b
removed host cmake dependency
cekees Sep 10, 2015
e030d4f
Merge remote-tracking branch 'origin/proteus_update' into stable/spirit
cekees Sep 11, 2015
80b58f3
cleaned up hacks on spirit now that compilers are fixed
cekees Sep 11, 2015
a73fe6d
Merge branch 'proteus_update' into cekees/kitchen_sink
cekees Sep 11, 2015
07dbd7f
Merge remote-tracking branch 'ssh/master'
cekees Sep 11, 2015
d531ab7
post-merge cleanup
cekees Sep 11, 2015
7f0252f
Merge remote-tracking branch 'origin/master' into stable/spirit
cekees Sep 12, 2015
605c823
added superlu make.inc for icex
cekees Sep 16, 2015
40f035b
adds yaml file for proteus on stampede
smattis Sep 24, 2015
68e16ef
Merge pull request #846 from smattis/master
certik Sep 24, 2015
2684cea
Merge remote-tracking branch 'origin/master' into stable/proteus
cekees Sep 26, 2015
f0ef926
Merge branch 'petsc_3.6.1_updates' into stable/proteus
cekees Sep 26, 2015
048d01d
updated linux some versions in proteus linux2 stack
cekees Sep 26, 2015
5e306cd
Merge branch 'update_matplotlib_1.4.3' into stable/proteus
cekees Sep 26, 2015
1b68a48
Merge branch 'update_matplotlib_1.4.3' into stable/proteus
cekees Sep 26, 2015
774008e
Merge branch 'add_jupter' into stable/proteus
cekees Sep 27, 2015
d88e512
fixed some problems with jupyter sub-stack
cekees Sep 27, 2015
b7c8004
Merge branch 'add_jupter' into stable/proteus
cekees Sep 27, 2015
2beb8a7
Merge remote-tracking branch 'origin/master' into stable/proteus
cekees Sep 28, 2015
ec360aa
Merge remote-tracking branch 'origin/master' into stable/spirit
cekees Oct 1, 2015
40c023b
added sphinx-bootstrap so docs build
cekees Oct 3, 2015
0ebe416
Merge remote-tracking branch 'origin/master' into stable/spirit
cekees Oct 3, 2015
f4cba14
Merge remote-tracking branch 'origin/master' into stable/spirit
cekees Oct 3, 2015
6e7a0ee
updated petsc for stable/spirit
cekees Oct 4, 2015
680b0ef
updated stampede profile to petsc 3.6.1
cekees Oct 7, 2015
af48ec8
added jupyter to darwin stack
cekees Oct 12, 2015
574dda5
Merge branch 'stable/proteus' of https://github.com/hashdist/hashstac…
cekees Oct 12, 2015
3461e3d
fixes for topaz XC30
cekees Oct 15, 2015
6b47787
Merge remote-tracking branch 'origin/master' into stable/proteus
cekees Nov 5, 2015
fd692ba
add petscversion parameter to daetk.yaml, suports 3.5.2, 3.6.1
cekees Nov 19, 2015
63ba346
added chrono and dependencies
cekees Nov 19, 2015
bc1def1
updated sphinx-bootstrap-theme
cekees Nov 19, 2015
0c5aff9
upgrade sphinx
cekees Nov 20, 2015
bffb383
upgrade cython to 23.4
cekees Nov 20, 2015
6e80c15
add chrono
cekees Nov 20, 2015
6edcad0
added missing runtime dependencies of sphinx
cekees Nov 20, 2015
34ef64e
Merge remote-tracking branch 'origin/master' into stable/proteus
cekees Jan 19, 2016
d02408b
Merge remote-tracking branch 'origin/master' into update_proteus_travis
cekees Jan 19, 2016
6239a7a
Merge remote-tracking branch 'origin/master' into update_proteus_travis
cekees Jan 19, 2016
92ecf02
updated daetk.yaml
cekees Jan 19, 2016
f556a94
Merge remote-tracking branch 'origin/stable/proteus' into update_prot…
cekees Jan 19, 2016
2cd61b1
update chrono and coverage versions
cekees Jan 19, 2016
e1b1583
Merge remote-tracking branch 'origin/stable/proteus' into update_prot…
cekees Jan 19, 2016
ed55f4e
removed chrono from default proteus.linux2 stack
cekees Jan 19, 2016
fac6c40
Merge remote-tracking branch 'origin/master' into cekees/kitchen_sink
cekees Feb 2, 2016
9c2dd83
post-merge fixes
cekees Feb 2, 2016
d19a942
Merge branch 'stable/proteus' into cekees/kitchen_sink
cekees Feb 2, 2016
1cd55da
Fix openjpeg version to 1.5
robertsawko Feb 16, 2016
c02c1e9
added version to openjpeg
cekees Feb 16, 2016
93e02c4
Merge branch 'fix_openjpeg' into cekees/kitchen_sink
cekees Feb 17, 2016
8b1c85c
Merge branch 'cekees/fix_openjpeg' into cekees/kitchen_sink
cekees Feb 17, 2016
fa74ec8
openjpeg fix
cekees Feb 17, 2016
311f22a
Merge remote-tracking branch 'origin/master' into cekees/kitchen_sink
cekees Mar 2, 2016
46a2d44
Merge remote-tracking branch 'origin/master' into cekees/kitchen_sink
cekees Mar 2, 2016
b65c9bb
updated cgal, daetk, hdf5, pycgal, and superlu
cekees Mar 3, 2016
98905e1
changes for working on basic debian:jessie image
cekees Mar 4, 2016
7b69708
removed stwave
cekees Mar 4, 2016
ec5d9e6
Merge remote-tracking branch 'origin/master' into cekees/kitchen_sink
cekees Mar 11, 2016
22cac6f
updated ipython parallel support
cekees Mar 11, 2016
53d925f
Merge remote-tracking branch 'origin/master' into cekees/kitchen_sink
cekees Mar 17, 2016
318952d
Merge remote-tracking branch 'origin/master' into stable/proteus
cekees Mar 17, 2016
f418dd9
removed old adh pkg.yaml
cekees Mar 17, 2016
210d41f
added a libjpeg since openjpeg just support jpeg2000
cekees Mar 17, 2016
d886591
updated grib_api and pygrib versions, added libjpeg package
cekees Mar 18, 2016
2ea0e67
Merge remote-tracking branch 'origin/master' into stable/topaz
cekees Mar 22, 2016
74f671b
Merge remote-tracking branch 'origin/stable/proteus' into stable/topaz
cekees Mar 22, 2016
3bb1671
Merge remote-tracking branch 'erdc/cekees/kitchen_sink' into stable/t…
cekees Mar 22, 2016
a2c1243
added sphinxtogithub extension
cekees Apr 1, 2016
705d01f
Merge remote-tracking branch 'origin/master' into stable/proteus
cekees Apr 1, 2016
77c4321
changed petsc superlu default
cekees Apr 1, 2016
f3398bd
added openjpeg, ipyparallel, and sphinxtogithub to stable/proteus
cekees Apr 1, 2016
11b006c
Merge commit 'a2c124356db98479aac6fe04c1926b00a1b13f0e' into stable/p…
cekees Apr 1, 2016
2c825b5
chrono: added bzip2 as explicit dependency
tridelat Apr 5, 2016
492b9e5
Merge pull request #942 from tridelat/stable/proteus
cekees Apr 5, 2016
55be080
working version on topaz, tweaks to proteus.topaz.yaml, h5py, petsc, …
cekees Apr 7, 2016
1213ea5
Merge remote-tracking branch 'erdc/cekees/kitchen_sink' into stable/t…
cekees Apr 7, 2016
55beb1b
adds PETSC_SKIP_COMPLEX define to avoid petscmath issues with complex…
mfarthin Apr 27, 2016
49ac1be
updates proteus stack and configuration to compile with clang 7.3.0. …
mfarthin Apr 28, 2016
0055ef5
yaml showing up as a dependency for jupyter
mfarthin Apr 29, 2016
1bf83d0
Merge remote-tracking branch 'origin' into proteus-darwin10.11-fixes
mfarthin May 9, 2016
e160625
Merge branch 'stable/proteus' of https://github.com/hashdist/hashstac…
mfarthin May 9, 2016
a2c9d68
Merge remote-tracking branch 'origin' into proteus-darwin10.11-fixes
mfarthin May 13, 2016
88bf0ee
Merge branch 'stable/proteus' of https://github.com/hashdist/hashstac…
cekees May 17, 2016
71a6a07
updated hashdist branch
cekees May 17, 2016
4c3a591
parmetis jbuf fix already in stable/proteus. fixes pytables issue wit…
mfarthin May 17, 2016
03aa2ee
Merge remote-tracking branch 'upstream/stable/proteus' into proteus-d…
mfarthin May 17, 2016
861e270
switches numpy to extend setuptools_package
mfarthin May 17, 2016
172f4b8
switched back to hashstack mpich for mpi
cekees May 18, 2016
378e978
switching host-mpi back to setting each compiler
cekees May 18, 2016
3b21296
sets SHARED variable explicitly for building dynamic libraries in par…
mfarthin May 25, 2016
76752b4
updates superlu library version for darwin, sets openjpeg version for…
mfarthin May 25, 2016
46e03d2
changes capitalization for proteus.Darwin to match sys output on mac
mfarthin May 25, 2016
0f6c8b7
Merge pull request #955 from mfarthin/proteus-fix-Darwin-name
cekees May 25, 2016
6d9e9af
updated cython url/hash
cekees Jul 13, 2016
4c802b4
Merge branch 'master' into stable/proteus
cekees Jul 13, 2016
418d001
removed chrono for default stack
cekees Jul 13, 2016
565c88a
added pytest
cekees Jul 27, 2016
3b6c387
udpated py and pytest versions in stable/proteus
cekees Aug 5, 2016
e4ddc09
updated pytest support
cekees Aug 9, 2016
8dbed62
added pytest,pytest-xdist to linux2 and darwin proteus
cekees Aug 9, 2016
7886a8c
added execnet and apipkg deps
cekees Aug 9, 2016
af664d9
updated zoltan and removed superlu_dist from petsc build
cekees Aug 25, 2016
abfa457
updated yaml files of pkgs for gcc 6 compilation
tridelat Nov 2, 2016
06d9329
Merge pull request #971 from tridelat/stable/proteus
cekees Nov 4, 2016
1531189
Merge remote-tracking branch 'origin/master' into stable/proteus
cekees Nov 8, 2016
d3ecfaf
Merge branch 'stable/proteus' of https://github.com/hashdist/hashstac…
cekees Nov 8, 2016
87a1377
fixed typo in url
cekees Nov 14, 2016
e15f63e
updated chrono.yaml
cekees Nov 16, 2016
3aad448
updating buildbot-slave to buildbot-worker
cekees Nov 17, 2016
2d3adf5
Merge branch 'stable/proteus' into stable/topaz
cekees Nov 17, 2016
ea0f67b
Merge branch 'stable/topaz' of github.com:hashdist/hashstack into sta…
cekees Nov 17, 2016
486843c
added incremental
cekees Nov 17, 2016
4134ad2
Merge branch 'stable/topaz' of github.com:hashdist/hashstack into sta…
cekees Nov 17, 2016
7ee5419
added future
cekees Nov 17, 2016
0c155ba
Merge branch 'stable/topaz' of github.com:hashdist/hashstack into sta…
cekees Nov 17, 2016
d908df0
fixed linking in cryptography, updated topaz
cekees Nov 17, 2016
0ba73fc
added blaze package
cekees Nov 17, 2016
4750e3d
Merge branch 'stable/topaz' into stable/proteus
cekees Nov 17, 2016
63f274d
added python pkgconfig
cekees Nov 17, 2016
e78340e
making hashdist openblas the default blas/lapack
cekees Nov 19, 2016
3b8637b
switched git protocal for ncurses
cekees Nov 19, 2016
b3ced40
made openblas the default blas/lapack, updated chrono
cekees Nov 19, 2016
118764b
made openblas default in petsc, updated daetk
cekees Nov 19, 2016
d79503a
fixed libjpeg dep in irrlicht/chrono, lapack dep in scipy
Nov 20, 2016
09f25e6
updated readline and cleaned up erdc packages
cekees Nov 30, 2016
59bc902
removed the stwave package, can get it from hashstack_private
cekees Nov 30, 2016
ec1811e
moved chrono back to project repo, added petsc cmake dep
cekees Nov 30, 2016
4499a58
added lapack package that properly points to openblas
cekees Dec 1, 2016
ca8376d
updated scipy references to blas and lapack
cekees Dec 2, 2016
54fdc9e
updated scorec package and added gmsh
cekees Dec 5, 2016
1db7a68
updated packcage versions
cekees Dec 15, 2016
376c140
enabled julia, but compilation is failing
cekees Dec 21, 2016
c5c9890
working version with jupyter, requires `pip install entrypoints`
cekees Dec 22, 2016
559a94f
updated default list or proteus package--no widgets
cekees Dec 22, 2016
50f9ac5
Merge branch 'add_julia' into proteus_update
cekees Dec 23, 2016
4465af2
added julia, vtk and updated matplotlib
cekees Dec 23, 2016
96b1486
added cycler package
cekees Dec 23, 2016
4911456
added backports-shutil
cekees Dec 23, 2016
39b4757
added html5lib, sanitizer, and webencodings
cekees Dec 23, 2016
3c8f21e
fix shapely dependence on geos
cekees Dec 23, 2016
9b38f7f
shapely requires geos on LD_LIBRARY_PATH at runtime
cekees Dec 23, 2016
1a449cc
add pyjulia
cekees Dec 24, 2016
b8c66eb
removed scorec until -Werror issue is resolved
cekees Dec 24, 2016
4e11811
updated julia build with explicit dependencies that were missing
cekees Dec 27, 2016
5068869
updated zmq version
cekees Dec 29, 2016
0a014f6
Merge branch 'stable/proteus' of https://github.com/hashdist/hashstac…
cekees Dec 29, 2016
bf31ae8
enabled scorec by switching build from Release to Debug
cekees Dec 29, 2016
3598841
switched scorec to RelWithDebInfo
cekees Dec 29, 2016
aaa9701
added relwithdebinfo option for cmake packages with debug=false
cekees Dec 29, 2016
2ca88aa
updated petsc to 3.7.5
cekees Jan 3, 2017
53cd7d5
updated mpich, fixed sphinx dependencies
cekees Jan 5, 2017
800aeee
added imagesize (sphinx dependency)
cekees Jan 5, 2017
0a02005
updated version of sphinx-bootstrap-theme
cekees Jan 8, 2017
2d51036
added mayavi
cekees Jan 8, 2017
d2ce224
set cmake SWIG_DIR from hashdist env
cekees Jan 9, 2017
042eebc
updated swig version to fix pycgal build
cekees Jan 9, 2017
d2c33b6
switched git repos github archive tarballs, etc.
cekees Jan 11, 2017
f107fbf
explicitly force chrono python to be hashdist python
cekees Jan 11, 2017
cf1dca1
update CGAL python bindings
cekees Jan 13, 2017
75759ad
removing pycgal from default stack, builds are too unstable
cekees Jan 13, 2017
c6b460c
turning off chrono python bindings, too brittle
cekees Jan 14, 2017
f34193e
fixed proteus package
cekees Jan 16, 2017
a963ecb
update proteus package config
cekees Jan 18, 2017
8787d58
build scorec libraries as shared
cekees Jan 26, 2017
acb3c60
Merge remote-tracking branch 'origin/stable/proteus' into stable/proteus
cekees Jan 26, 2017
83752be
updated zoltan config
cekees Jan 26, 2017
e88b5ba
switched petsc dependency to blas so we don't get two blas installs
cekees Jan 27, 2017
206a48b
fix openblas-lapack
cekees Jan 27, 2017
7043854
added better handling of blas/openblas in petsc
cekees Jan 27, 2017
9520ae6
switch julia from explicit openblas to blas dependency
cekees Jan 27, 2017
9277cfc
fixes for doxygen and mpich
mfarthin Feb 24, 2017
75424c8
changes for getting latest compile on mac 10.11
mfarthin Feb 28, 2017
69905c9
modified to hit the hdfgroup ftp site for szip and hdf5
ahines Mar 3, 2017
85eccd7
updates for compiling on mac. Main change is pushing openmpi to 1.10 …
mfarthin Mar 7, 2017
a71c15d
Merge branch 'mwf/mac_fixes_0204' of github.com:mfarthin/hashstack in…
mfarthin Mar 7, 2017
83cd9b8
updated vtk version and matplotlib dependencies
cekees Mar 30, 2017
f0ba912
updated proteus package and added simple proteus stack
cekees Apr 13, 2017
96b86b4
removed tornado and all backports from stack
cekees Apr 15, 2017
88a84ba
added scandir package
cekees Apr 16, 2017
a24dd20
Update hdf5, add scorec.
tjcorona May 10, 2017
8acb539
Make python build shared libraries.
tjcorona May 10, 2017
dc71453
Update boost
tjcorona May 10, 2017
6f41242
Update cmake, vtk.
tjcorona May 10, 2017
e0df5e0
updated chrono and gmsh pkgs source
tridelat May 25, 2017
71558c2
Merge pull request #990 from tridelat/stable/proteus
cekees May 27, 2017
cfc860a
removing clawpack and matplotlib
cekees Jun 16, 2017
01d4546
added chrono subdir
cekees Jun 16, 2017
3f675af
Merge branch 'mac_fixes' into stable/proteus
tjcorona Jun 19, 2017
faa7856
updated hdf5, matplotlib, pytables, and scorec
cekees Jun 21, 2017
f176638
updated pyjulia
cekees Jun 21, 2017
d3d2760
added newline to proteus linux2 profile
cekees Jun 22, 2017
c810f16
added record type
cekees Jun 24, 2017
dee54af
re-updated chrono commit
tridelat Jul 6, 2017
d88255e
force zoltan to build with parmetis
cekees Jul 17, 2017
8dfaf29
Merge pull request #992 from tridelat/stable/proteus
cekees Jul 17, 2017
cf43292
update chrono (again)
cekees Jul 18, 2017
5eb94ce
removed irrlicht from chrono build by default
cekees Jul 18, 2017
9cc3f24
turned off shared linking for gmsh
cekees Jul 23, 2017
4a06d06
updated chrono, hdf5, proteus, and julia
cekees Sep 19, 2017
0f1c970
updated chrono hash
cekees Sep 19, 2017
de5c7bf
updated openblas and simplified petsc
cekees Sep 29, 2017
9389637
updated several packages and added pytest-cov and pybind11 to linux
cekees Oct 2, 2017
fbf0d9b
fixed h5py's hdf5 version id
cekees Oct 5, 2017
8058c67
chrono pkg to stable version 3.0.0
tridelat Nov 13, 2017
a38f3fb
Merge pull request #996 from tridelat/stable/proteus
cekees Nov 15, 2017
938241b
updated adh package
cekees Dec 9, 2017
6953b52
updated mpich version
cekees Dec 9, 2017
e457d1c
added simple adh stack
cekees Dec 10, 2017
5d9cb17
Clean up of proteus.linux2.yaml (#997)
zhang-alvin Feb 7, 2018
6375fb5
matplotlib, numpy, pytest and friends
cekees Mar 4, 2018
de68c09
added new dependencies for pytest
cekees Mar 4, 2018
ba73235
added pcs_api so buildbots can push artifacts
cekees Mar 4, 2018
a6bdecd
updated matplotlib dep (kiwisolver)
cekees Mar 4, 2018
8896ea2
add back in some pure python backports that pip has trouble with
cekees Mar 6, 2018
4e106d4
use shared libs for gmsh build
cekees Mar 14, 2018
140d24c
updated numpy/scipy stack
cekees Mar 14, 2018
8aa1f38
updated pyaml (yaml)
cekees Mar 17, 2018
1a158b1
updated scorec.yaml (#998)
zhang-alvin Mar 24, 2018
09f651d
Update SCOREC pkg for 2D Reconstruction (#999)
zhang-alvin Apr 22, 2018
13a258a
add bzip2 to scorec dependencies
cekees Apr 23, 2018
028265d
new py2to3 stack
cekees Jul 4, 2018
185b9c8
update matplotlib
cekees Jul 5, 2018
7fd3deb
update proteus build and run deps
cekees Jul 9, 2018
1af4808
roll back matplotlib to see if it fixes functools_lru problem
cekees Jul 9, 2018
8e710bf
rolling back matplotlib to 2.2.0
cekees Jul 9, 2018
6be0f60
update matplotlib to 2.2.2
cekees Jul 10, 2018
708894c
remove matplotlib from stack
cekees Jul 11, 2018
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ before_install:
sudo apt-get install cmake libopenmpi-dev python-dev libblas-dev liblapack-dev wget libboost-program-options1.48-dev libboost-filesystem1.48-dev libboost-serialization1.48-dev libboost-thread1.48-dev libboost-iostreams1.48-dev libboost-math1.48-dev libboost-timer1.48-dev libboost-chrono1.48-dev;
fi
install:
- git clone https://github.com/hashdist/hashdist
- git clone https://github.com/hashdist/hashdist -b cekees/add_bld_mirrors
- export PATH=`pwd`/hashdist/bin:$PATH
script:
- cp tests/$TEST_PROFILE $TEST_PROFILE
Expand Down
33 changes: 33 additions & 0 deletions adh-stack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This profile file controls your <#> (HashDist) build environment.

# In the future, we'll provide better incorporation of
# automatic environment detection. For now, have a look
# at the YAML files in the top-level directory and choose
# the most *specific* file that matches your environment.

extends:
- file: debian.yaml

# The packages list specifies all the packages that you
# require installed. <#> will ensure that all packages
# and their dependencies are installed when you build this
# profile.

packages:
cmake:
openssl:
use: host-openssl
python:
host: false
link: shared
build_with: |
bzip2, sqlite, openssl
blas:
use: openblas
lapack:
use: openblas-lapack
mpi:
use: mpich
parmetis:
sympy:
adh:
6 changes: 6 additions & 0 deletions base/base_package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ post_process:
- "check-ignore=.*\\.pyc\\$"
- "check-ignore=.*\\.pyo\\$"

- name: insert_location
when: relocatable != True
after: [default]
hit:
- insert-location

profile_links:
- when: platform == 'Cygwin'
name: copy_dlls
Expand Down
7 changes: 5 additions & 2 deletions base/cmake_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ def configure(ctx, stage_args):
if stage_args['debug']:
conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=Debug')
else:
conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=Release')

if stage_args['relwithdebinfo']:
conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo')
else:
conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=Release')

if stage_args.get('empty_osx_deployment_target', False):
conf_lines.append('-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=""')

Expand Down
1 change: 1 addition & 0 deletions base/cmake_package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ build_stages:
- name: configure
after: setup_builddir
debug: {{debug}}
relwithdebinfo: {{relwithdebinfo}}

- name: make
after: configure
Expand Down
1 change: 1 addition & 0 deletions cygwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ parameters:
HOST_MPIF77: /usr/bin/mpif77
HOST_MPIF90: /usr/bin/mpif90
HOST_MPIEXEC: /usr/bin/mpiexec
HOST_JASPER_DIR: /usr
HOST_CMAKE: /usr/bin/cmake
HOST_PYTHON: /usr/bin/python
HOST_PKG_CONFIG_EXECUTABLE: /usr/bin/pkgconfig
Expand Down
33 changes: 33 additions & 0 deletions examples/adh-stack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This profile file controls your <#> (HashDist) build environment.

# In the future, we'll provide better incorporation of
# automatic environment detection. For now, have a look
# at the YAML files in the top-level directory and choose
# the most *specific* file that matches your environment.

extends:
- file: debian.yaml

# The packages list specifies all the packages that you
# require installed. <#> will ensure that all packages
# and their dependencies are installed when you build this
# profile.

packages:
cmake:
openssl:
use: host-openssl
python:
host: false
link: shared
build_with: |
bzip2, sqlite, openssl
blas:
use: openblas
lapack:
use: openblas-lapack
mpi:
use: mpich
parmetis:
sympy:
adh:
4 changes: 3 additions & 1 deletion examples/proteus.Cygwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ packages:
mpi4py:
nose:
hdf5:
ipython:
pygments:
tornado:
pyzmq:
matplotlib:
petsc:
build_with: |
Expand Down
40 changes: 31 additions & 9 deletions examples/proteus.Darwin.yaml → examples/proteus.darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
# at the YAML files in the top-level directory and choose
# the most *specific* file that matches your environment.

parameters:
airgap: True

extends:
- file: osx.yaml
- file: osx_clt.yaml

parameters:
fortran: true

# The packages list specifies all the packages that you
# The packages list specifies all the packages that you
# require installed. <#> will ensure that all packages
# and their dependencies are installed when you build this
# profile.
Expand All @@ -20,45 +21,66 @@ packages:

launcher:
cmake:
openjpeg:
version: '2.1'
python:
host: false
link: shared
build_with: |

blas:
use: host-osx-framework-accelerate
lapack:
use: host-osx-framework-accelerate
daetk:
mpi:
use: mpich
use: openmpi
mpi4py:
nose:
hdf5:
pygments:
tornado:
pyzmq:
parmetis:
ipython:
matplotlib:
petsc:
version: 3.7.5
build_with: |
parmetis
parmetis, cmake, suitesparse
download: |
superlu, superlu_dist
coptflags: -O2
link: shared
debug: false
disable_fortran: true
petsc4py:
version: 3.7.0
with_conf: true
pillow:
pytables:
scorec:
sphinx:
superlu:
#superlu:
sympy:
tetgen:
triangle:
memory_profiler:
ipdb:
pip:
pexpect:
doxygen:
scipy:
netcdf4:
netcdf4f:
netcdf4cpp:
python-netcdf4:
h5py:
ode:
openblas:
jupyter:
functools:
use: host-functools
yaml:
pytest:
pytest-xdist:
boost:
toolset: darwin
59 changes: 51 additions & 8 deletions examples/proteus.garnet.gnu.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# This profile file controls your <#> (HashDist) build environment.

# In the future, we'll provide better incorporation of
# automatic environment detection. For now, have a look
# at the YAML files in the top-level directory and choose
Expand All @@ -15,6 +14,7 @@ extends:

parameters:
machine: CrayXE6
HOST_MATLAB: '/usr/local/applic/matlab/R2012b/bin/matlab'
HOST_MPICC: cc
HOST_MPICXX: CC
HOST_MPIF77: ftn
Expand All @@ -23,27 +23,31 @@ parameters:
PATH: |
/usr/bin:/bin:/usr/sbin:/sbin
PROLOGUE: |
source /opt/modules/default/init/bash; export MODULEPATH=/opt/cray/gem/modulefiles:/opt/cray/xt-asyncpe/default/modulefiles:/opt/modulefiles:/opt/cray/modulefiles:/cm/local/modulefiles:/cm/shared/modulefiles:/usr/local/modulefiles/COTS:/usr/local/modulefiles/unsupported; export MODULESHOME=/opt/modules/3.2.6.7; export MODULE_VERSION=3.2.6.7; export MODULE_VERSION_STACK=3.2.6.7; echo "unloading modules"; module unload PrgEnv-pgi; echo "loading modules"; module load PrgEnv-gnu/4.2.34; module load cray-mpich/6.0.0; module unload cray-libsci; module load acml/5.3.1; echo "setting default compilers"; export CC=gcc; export CXX=g++; export FC=gfortran; export F77=gfortran; export F90=gfortran; export CPP=cpp;
unset RCLOCAL_PRGENV; source /etc/bash.bashrc; source /etc/bash.bashrc.local; module swap PrgEnv-cray PrgEnv-gnu; module load cray-mpich; module list; echo "setting default compilers"; export CC=gcc; export CXX=g++; export FC=gfortran; export F77=gfortran; export F90=gfortran; export CPP=cpp;
DYNAMIC_EXE_LINKER_FLAGS: -dynamic

packages:
launcher:
cmake:
python:
host: false
link: shared
build_with: |
openssl,bzip2,sqlite
link: shared
blas:
use: host-acml-blas
use: host-libsci-blas
lapack:
use: host-acml-lapack
use: host-libsci-lapack
daetk:
mpi:
use: host-mpi
mpi4py:
nose:
hdf5:
ipython:
pygments:
tornado:
pyzmq:
matplotlib:
parmetis:
without_check: true
Expand All @@ -64,12 +68,51 @@ packages:
tetgen:
triangle:
memory_profiler:
scipy:
# boost:
# toolset: gcc
# address_model: 64
# build_with: |
# python
#
# cgal:
# pycgal:
netcdf4:
netcdf4f:
python-netcdf4:
ipdb:
pip:
vapory:
jasper:
grib_api:
pyproj:
pygrib:
#adh:
# link: shared
stwave:
scipy:
# ipython:
# sources:
# - key: git:68f6519cdfd23581ed7358fa1941ae1bbd76e5b3
# url: https://github.com/ellisonbg/ipython.git
#
h5py:
pydap:
# leafletwidget:
# sources:
# - key: git:f9147c5b13a69b80bc28d3574f7ba6b2c576aed2
# url: https://github.com/erdc-cm/leafletwidget.git
geojson:
rdp:
# ipython-widgetmode:
# ipython-d3plot:
# ipython-gridwidget:
# shapely:
# rtree:
# matlab:
# use: host-matlab
# pymatbridge:
ode:
# ipdb:
pip:
pexpect:
ipdb:
# vtk:
# pyvtk:
65 changes: 65 additions & 0 deletions examples/proteus.linux2-scorec.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# This profile file controls your <#> (HashDist) build environment.

# In the future, we'll provide better incorporation of
# automatic environment detection. For now, have a look
# at the YAML files in the top-level directory and choose
# the most *specific* file that matches your environment.

extends:
- file: debian.yaml

# The packages list specifies all the packages that you
# require installed. <#> will ensure that all packages
# and their dependencies are installed when you build this
# profile.

packages:

launcher:
cmake:
use: host-cmake
python:
host: false
link: shared
build_with: |
bzip2, sqlite
blas:
use: host-blas
daetk:
mpi:
use: host-mpi
mpi4py:
nose:
hdf5:
ipython:
matplotlib:
petsc:
build_with: |
parmetis
download: |
hypre, blacs, scalapack, superlu, superlu_dist
coptflags: -O2
link: shared
debug: true
petsc4py:
with_conf: true
pytables:
scorec:
simmetrix:
sphinx:
superlu:
sympy:
tetgen:
triangle:
zoltan:
build_with: |
parmetis

parameters:
HOST_MPI_DIR: /usr/local/mpich3/3.1.2-thread-multiple
HOST_CMAKE: /usr/local/cmake/latest/bin/cmake
HOST_SIMMETRIX_LIB: /net/common/meshSim/9.0-140816/lib/x64_rhel5_gcc41
HOST_SIMMETRIX_INCLUDE: /net/common/meshSim/9.0-140816/include
HOST_PYTHON: python
HOST_PKG_CONFIG_EXECUTABLE: pkg-config
PATH: /usr/bin:/bin:/usr/local/mpich3/3.1.2-thread-multiple/bin/
Loading