diff --git a/.gitmodules b/.gitmodules index ec918022b..aca2fba6e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "scripts/uberenv"] path = scripts/uberenv url = https://github.com/LLNL/uberenv.git +[submodule "scripts/uberenv_configs/spack_configs"] + path = scripts/uberenv_configs/spack_configs + url = https://github.com/Alpine-DAV/spack_configs.git diff --git a/.travis.yml b/.travis.yml index 8b695abac..601cd8221 100644 --- a/.travis.yml +++ b/.travis.yml @@ -194,7 +194,7 @@ script: - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done & # build deps using uberenv # use -k to avoid suprises related to certs - - python scripts/uberenv/uberenv.py -k --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv_configs/spack_configs/travis/ --mirror=https://www.ascent-dav.org/mirror/conduit/latest/ || travis_terminate 1; + - python scripts/uberenv/uberenv.py -k --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv_configs/spack_configs/configs/travis/ || travis_terminate 1; # todo: #- export SPACK_PYTHON_BIN_DIR=`ls -d ${TRAVIS_BUILD_DIR}/uberenv_libs/spack/opt/spack/*/*/python*/bin` #- pip install cpp-coveralls diff --git a/.uberenv_config.json b/.uberenv_config.json index 7d51b546d..b7cb88816 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -6,8 +6,7 @@ "spack_configs_path": "scripts/uberenv_configs/spack_configs", "spack_packages_path": "scripts/uberenv_configs/packages", "spack_url": "https://github.com/alpine-DAV/spack", -"spack_branch": "conduit/develop", -"mirror_url": "https://www.ascent-dav.org/mirror/conduit/latest/", +"spack_branch": "ascent/develop", "spack_activate" : {"py-numpy" : ["+python"], "py-sphinx": ["+python","+doc"], "py-mpi4py" : ["+python", "+mpi"], diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d1b5c1c40..e7bf436b0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -77,31 +77,15 @@ stages: CMAKE_BUILD_TYPE: Debug ENABLE_COVERAGE: ON ENABLE_MPI: ON - ENABLE_DOCS: ON + ENABLE_DOCS: OFF ENABLE_RELAY_WEBSERVER: ON ENABLE_SILO: ON ENABLE_ADIOS: OFF ENABLE_PYTHON: ON ENABLE_PARMETIS: ON - PYTHON_VERSION: 2.7.18 ENABLE_PYTHON2: ON - PYTHON2_CONSTRAINTS: " ^py-setuptools@44.1.0 ^py-pygments@2.4.2 " - CMAKE_VERSION: 3.14.2 - BLT_CXX_STD: c++11 - - shared_py36: - BUILD_SHARED_LIBS: ON - CMAKE_BUILD_TYPE: Debug - ENABLE_COVERAGE: OFF - ENABLE_MPI: ON - ENABLE_RELAY_WEBSERVER: ON - ENABLE_DOCS: ON - ENABLE_SILO: ON - ENABLE_ADIOS: OFF - ENABLE_PARMETIS: ON - ENABLE_PYTHON: ON - ENABLE_PYTHON2: OFF - PYTHON_VERSION: 3.6.3 + PYTHON2_CONSTRAINTS: " ^py-setuptools@44.1.0 ^py-numpy@1.16.5" + PYTHON_VERSION: 2.7.18 CMAKE_VERSION: 3.14.2 BLT_CXX_STD: c++11 @@ -126,15 +110,15 @@ stages: CMAKE_BUILD_TYPE: Debug ENABLE_COVERAGE: OFF ENABLE_MPI: ON - ENABLE_DOCS: ON + ENABLE_DOCS: OFF ENABLE_RELAY_WEBSERVER: ON ENABLE_SILO: ON ENABLE_ADIOS: OFF ENABLE_PARMETIS: ON ENABLE_PYTHON: ON ENABLE_PYTHON2: ON + PYTHON2_CONSTRAINTS: " ^py-setuptools@44.1.0 ^py-numpy@1.16.5" PYTHON_VERSION: 2.7.18 - PYTHON2_CONSTRAINTS: " ^py-setuptools@44.1.0 ^py-pygments@2.4.2 " CMAKE_VERSION: 3.14.2 BLT_CXX_STD: c++11 @@ -224,7 +208,6 @@ stages: # package ver selections and extra tweaks export SPACK_SPEC="${SPACK_SPEC} ^cmake@${CMAKE_VERSION}" if [ $ENABLE_PYTHON = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^python@${PYTHON_VERSION}"; fi - # fix constraint issue for python 2 if [ $ENABLE_PYTHON2 = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ${PYTHON2_CONSTRAINTS}"; fi if [ $ENABLE_SILO = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^silo~mpi"; fi # turn off hdf5 mpi support @@ -232,7 +215,7 @@ stages: # show final spec echo $SPACK_SPEC # run uber to build tpls - python scripts/uberenv/uberenv.py -k --pull --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv_configs/spack_configs/ci/ubuntu_16/ --mirror=https://www.ascent-dav.org/mirror/conduit/latest/ + python scripts/uberenv/uberenv.py -k --pull --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv_configs/spack_configs/configs/alpinedav/ubuntu_16/ displayName: 'Spack Build Tpls' - script: | @@ -404,7 +387,7 @@ stages: ############################################################################### - job: Ubuntu_18 pool: - vmImage: 'ubuntu-16.04' + vmImage: 'ubuntu-latest' container: ${{ variables.ubuntu18_tag }} timeoutInMinutes: 0 variables: @@ -423,8 +406,7 @@ stages: ENABLE_SILO: ON ENABLE_ADIOS: OFF ENABLE_PYTHON: ON - PYTHON_VERSION: 3.6.3 - CMAKE_VERSION: 3.14.2 + CMAKE_VERSION: 3.21.1 BLT_CXX_STD: c++11 steps: - checkout: self @@ -493,16 +475,13 @@ stages: if [ $ENABLE_DOCS = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~doc"; fi # package ver selections and extra tweaks export SPACK_SPEC="${SPACK_SPEC} ^cmake@${CMAKE_VERSION}" - if [ $ENABLE_PYTHON = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^python@${PYTHON_VERSION}"; fi - # fix constraint issue for python 2 - if [ $ENABLE_PYTHON2 = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ${PYTHON2_CONSTRAINTS}"; fi if [ $ENABLE_SILO = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^silo~mpi"; fi # turn off hdf5 mpi support export SPACK_SPEC="${SPACK_SPEC} ^hdf5~mpi" # show final spec echo $SPACK_SPEC # run uber to build tpls - python scripts/uberenv/uberenv.py -k --pull --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv_configs/spack_configs/ci/ubuntu_16/ --mirror=https://www.ascent-dav.org/mirror/conduit/latest/ + python scripts/uberenv/uberenv.py -k --pull --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv_configs/spack_configs/configs/alpinedav/ubuntu_18_devel/ displayName: 'Spack Build Tpls' - script: | @@ -703,7 +682,7 @@ stages: ############################################################################### - job: Docker_Ubuntu pool: - vmImage: 'ubuntu-16.04' + vmImage: 'ubuntu-latest' timeoutInMinutes: 0 steps: - checkout: self @@ -718,185 +697,3 @@ stages: displayName: 'Docker Build' - # ############################################################################### - # # macOS 10.14 testing - # # - # ############################################################################### - # - job: macOS_14 - # pool: - # vmImage: 'macOS-10.14' - # timeoutInMinutes: 0 - # variables: - # COMPILER_CC: clang - # COMPILER_CXX: clang++ - # COMPILER_SPEC: clang - # strategy: - # matrix: - # shared_py36: - # BUILD_SHARED_LIBS: ON - # CMAKE_BUILD_TYPE: Debug - # ENABLE_COVERAGE: OFF - # ENABLE_MPI: ON - # ENABLE_DOCS: ON - # ENABLE_SILO: ON - # ENABLE_ADIOS: OFF - # ENABLE_PYTHON: ON - # PYTHON_VERSION: 3.6.3 - # CMAKE_VERSION: 3.9.4 - # BLT_CXX_STD: c++11 - # steps: - # - checkout: self - # clean: boolean - # submodules: recursive - # - # - script: | - # ################################# - # # run uber to build tpls - # ################################# - # # - # pwd - # # echo system python details - # which python - # python --version - # # setup spack spec - # export SPACK_SPEC="%${COMPILER_SPEC}" - # # mpi - # if [ $ENABLE_MPI = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC}+mpi"; fi - # if [ $ENABLE_MPI = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~mpi"; fi - # # silo - # if [ $ENABLE_SILO = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC}+silo"; fi - # if [ $ENABLE_SILO = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~silo"; fi - # # adios - # if [ $ENABLE_ADIOS = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC}+adios~zfp"; fi - # if [ $ENABLE_ADIOS = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~adios"; fi - # # python - # if [ $ENABLE_PYTHON = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC}+python"; fi - # if [ $ENABLE_PYTHON = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~python"; fi - # # docs - # if [ $ENABLE_DOCS = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC}+doc"; fi - # if [ $ENABLE_DOCS = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~doc"; fi - # # package ver selections and extra tweaks - # export SPACK_SPEC="${SPACK_SPEC} ^cmake@${CMAKE_VERSION}" - # if [ $ENABLE_PYTHON = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^python@${PYTHON_VERSION}"; fi - # if [ $ENABLE_SILO = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^silo~mpi"; fi - # if [ $ENABLE_MPI = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^mpich"; fi - # # show final spec - # echo $SPACK_SPEC - # # run uber to build tpls - # python scripts/uberenv/uberenv.py -k --pull --spec "${SPACK_SPEC}" - # displayName: 'Spack Build Tpls' - # - # - script: | - # ################################# - # # configure - # ################################# - # # setup compiler env vars - # export CC=${COMPILER_CC} - # export CXX=${COMPILER_CXX} - # ${CC} --version - # # capture current path - # export ROOT_DIR=`pwd` - # # find spack generated host config file - # export HOST_CONFIG=`ls ${ROOT_DIR}/uberenv_libs/*.cmake` - # echo $HOST_CONFIG - # # find spack installed cmake - # export CMAKE_BIN_DIR=`ls -d ${ROOT_DIR}/uberenv_libs/spack/opt/spack/*/*/cmake*/bin` - # export PATH=${CMAKE_BIN_DIR}:$PATH - # echo $PATH - # which cmake - # cmake --version - # # prepare build dir - # mkdir build - # cd build - # # setup cmake options - # export CMAKE_OPTS="-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" - # export CMAKE_OPTS="-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" - # export CMAKE_OPTS="${CMAKE_OPTS} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}" - # export CMAKE_OPTS="${CMAKE_OPTS} -DENABLE_COVERAGE=${ENABLE_COVERAGE}" - # export CMAKE_OPTS="${CMAKE_OPTS} -DBLT_CXX_STD=${BLT_CXX_STD}" - # export CMAKE_OPTS="${CMAKE_OPTS} -DCMAKE_INSTALL_PREFIX=../install" - # # configure - # cmake ${CMAKE_OPTS} -C ${HOST_CONFIG} ../src - # displayName: 'Configure with CMake' - # - # - script: | - # ################################# - # # build - # ################################# - # # build - # cd build - # make VERBOSE=1 - # displayName: 'Build' - # - # - script: | - # ################################# - # # test - # ################################# - # # find spack installed cmake - # export ROOT_DIR=`pwd` - # export CMAKE_BIN_DIR=`ls -d ${ROOT_DIR}/uberenv_libs/spack/opt/spack/*/*/cmake*/bin` - # export PATH=${CMAKE_BIN_DIR}:$PATH - # which ctest - # cd build - # # run ctest - # ctest -T test --output-on-failure -V - # displayName: 'Run Unit Tests' - # - # - task: PublishTestResults@2 - # inputs: - # testResultsFormat: 'cTest' - # testResultsFiles: '**/Test.xml' - # displayName: 'Unit Test Results' - # condition: always() - # - # - task: CopyFiles@2 - # inputs: - # contents: 'build/tests/_output/**' - # targetFolder: $(Build.ArtifactStagingDirectory) - # condition: always() - # - # - task: PublishBuildArtifacts@1 - # inputs: - # pathToPublish: $(Build.ArtifactStagingDirectory) - # artifactName: Conduit_Test_Outputs - # condition: always() - # - # - script: | - # ################################# - # # install - # ################################# - # cd build - # make install - # displayName: 'Install' - # - # - script: | - # ########################### - # # using with cmake example - # ########################### - # pwd - # ls -l - # # find spack installed cmake - # export ROOT_DIR=`pwd` - # export CMAKE_BIN_DIR=`ls -d ${ROOT_DIR}/uberenv_libs/spack/opt/spack/*/*/cmake*/bin` - # export PATH=${CMAKE_BIN_DIR}:$PATH - # echo $PATH - # which cmake - # cd install/examples/conduit/using-with-cmake - # mkdir _test_build - # cd _test_build - # cmake ../ - # make VERBOSE=1 - # ./conduit_example - # displayName: 'Test vs Install (using-with-cmake)' - # - # - script: | - # ########################### - # # using with make example - # ########################### - # cat install/share/conduit/conduit_config.mk - # pwd - # ls -l - # cd install/examples/conduit/using-with-make - # make - # ./conduit_example - # displayName: 'Test vs Install (using-with-make)' diff --git a/scripts/uberenv b/scripts/uberenv index b4ac7a160..105e384f5 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit b4ac7a1609a63565c3580cc0380c7d7ac56cb776 +Subproject commit 105e384f585e2391c42b2def93124a6580319c1c diff --git a/scripts/uberenv_configs/spack_configs/alcf/cooley/compilers.yaml b/scripts/uberenv_configs/old_configs/spack_configs/alcf/cooley/compilers.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/alcf/cooley/compilers.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/alcf/cooley/compilers.yaml diff --git a/scripts/uberenv_configs/spack_configs/alcf/cooley/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/alcf/cooley/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/alcf/cooley/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/alcf/cooley/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/alcf/theta/compilers.yaml b/scripts/uberenv_configs/old_configs/spack_configs/alcf/theta/compilers.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/alcf/theta/compilers.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/alcf/theta/compilers.yaml diff --git a/scripts/uberenv_configs/spack_configs/alcf/theta/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/alcf/theta/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/alcf/theta/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/alcf/theta/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/blueos_3_ppc64le_ib/compilers.yaml b/scripts/uberenv_configs/old_configs/spack_configs/blueos_3_ppc64le_ib/compilers.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/blueos_3_ppc64le_ib/compilers.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/blueos_3_ppc64le_ib/compilers.yaml diff --git a/scripts/uberenv_configs/spack_configs/blueos_3_ppc64le_ib/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/blueos_3_ppc64le_ib/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/blueos_3_ppc64le_ib/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/blueos_3_ppc64le_ib/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/blueos_3_ppc64le_ib_p9/compilers.yaml b/scripts/uberenv_configs/old_configs/spack_configs/blueos_3_ppc64le_ib_p9/compilers.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/blueos_3_ppc64le_ib_p9/compilers.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/blueos_3_ppc64le_ib_p9/compilers.yaml diff --git a/scripts/uberenv_configs/spack_configs/blueos_3_ppc64le_ib_p9/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/blueos_3_ppc64le_ib_p9/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/blueos_3_ppc64le_ib_p9/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/blueos_3_ppc64le_ib_p9/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/chaos_5_x86_64_ib/compilers.yaml b/scripts/uberenv_configs/old_configs/spack_configs/chaos_5_x86_64_ib/compilers.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/chaos_5_x86_64_ib/compilers.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/chaos_5_x86_64_ib/compilers.yaml diff --git a/scripts/uberenv_configs/spack_configs/chaos_5_x86_64_ib/host_config_manual_edits.txt b/scripts/uberenv_configs/old_configs/spack_configs/chaos_5_x86_64_ib/host_config_manual_edits.txt similarity index 100% rename from scripts/uberenv_configs/spack_configs/chaos_5_x86_64_ib/host_config_manual_edits.txt rename to scripts/uberenv_configs/old_configs/spack_configs/chaos_5_x86_64_ib/host_config_manual_edits.txt diff --git a/scripts/uberenv_configs/spack_configs/chaos_5_x86_64_ib/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/chaos_5_x86_64_ib/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/chaos_5_x86_64_ib/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/chaos_5_x86_64_ib/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/ci/ubuntu_16/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/ci/ubuntu_16/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/ci/ubuntu_16/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/ci/ubuntu_16/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/ci/ubuntu_18/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/ci/ubuntu_18/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/ci/ubuntu_18/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/ci/ubuntu_18/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/config.yaml b/scripts/uberenv_configs/old_configs/spack_configs/config.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/config.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/config.yaml diff --git a/scripts/uberenv_configs/spack_configs/darwin/compilers.yaml b/scripts/uberenv_configs/old_configs/spack_configs/darwin/compilers.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/darwin/compilers.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/darwin/compilers.yaml diff --git a/scripts/uberenv_configs/spack_configs/darwin/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/darwin/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/darwin/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/darwin/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/docker/ubuntu/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/docker/ubuntu/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/docker/ubuntu/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/docker/ubuntu/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/mirrors.yaml b/scripts/uberenv_configs/old_configs/spack_configs/mirrors.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/mirrors.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/mirrors.yaml diff --git a/scripts/uberenv_configs/spack_configs/nersc/cori/compilers.yaml b/scripts/uberenv_configs/old_configs/spack_configs/nersc/cori/compilers.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/nersc/cori/compilers.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/nersc/cori/compilers.yaml diff --git a/scripts/uberenv_configs/spack_configs/nersc/cori/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/nersc/cori/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/nersc/cori/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/nersc/cori/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/tacc/stampede2/compilers.yaml b/scripts/uberenv_configs/old_configs/spack_configs/tacc/stampede2/compilers.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/tacc/stampede2/compilers.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/tacc/stampede2/compilers.yaml diff --git a/scripts/uberenv_configs/spack_configs/tacc/stampede2/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/tacc/stampede2/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/tacc/stampede2/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/tacc/stampede2/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/toss_3_x86_64_ib/compilers.yaml b/scripts/uberenv_configs/old_configs/spack_configs/toss_3_x86_64_ib/compilers.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/toss_3_x86_64_ib/compilers.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/toss_3_x86_64_ib/compilers.yaml diff --git a/scripts/uberenv_configs/spack_configs/toss_3_x86_64_ib/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/toss_3_x86_64_ib/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/toss_3_x86_64_ib/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/toss_3_x86_64_ib/packages.yaml diff --git a/scripts/uberenv_configs/spack_configs/travis/packages.yaml b/scripts/uberenv_configs/old_configs/spack_configs/travis/packages.yaml similarity index 100% rename from scripts/uberenv_configs/spack_configs/travis/packages.yaml rename to scripts/uberenv_configs/old_configs/spack_configs/travis/packages.yaml diff --git a/scripts/uberenv_configs/spack_envs/llnl/quartz/spack.yaml b/scripts/uberenv_configs/old_configs/spack_envs/llnl/quartz/spack.yaml similarity index 100% rename from scripts/uberenv_configs/spack_envs/llnl/quartz/spack.yaml rename to scripts/uberenv_configs/old_configs/spack_envs/llnl/quartz/spack.yaml diff --git a/scripts/uberenv_configs/spack_configs b/scripts/uberenv_configs/spack_configs new file mode 160000 index 000000000..16abefa84 --- /dev/null +++ b/scripts/uberenv_configs/spack_configs @@ -0,0 +1 @@ +Subproject commit 16abefa84652b8ca17cf21f0b20ba61fb67fa44e diff --git a/src/docs/sphinx/building.rst b/src/docs/sphinx/building.rst index d5760a0c3..c7cc4a0e7 100644 --- a/src/docs/sphinx/building.rst +++ b/src/docs/sphinx/building.rst @@ -207,18 +207,18 @@ Uberenv Options for Building Third Party Dependencies ``uberenv.py`` has a few options that allow you to control how dependencies are built: - ==================== ============================================== ================================================ + ==================== ============================================== ============================================================== Option Description Default - ==================== ============================================== ================================================ + ==================== ============================================== ============================================================== --prefix Destination directory ``uberenv_libs`` --spec Spack spec linux: **%gcc** osx: **%clang** --spack-config-dir Folder with Spack settings files linux: (empty) - osx: ``scripts/uberenv/spack_configs/darwin/`` + osx: ``scripts/uberenv_configs/spack_configs/config/darwin/`` -k Ignore SSL Errors **False** --install Fully install conduit, not just dependencies **False** --run_tests Invoke tests during build and against install **False** - ==================== ============================================== ================================================ + ==================== ============================================== ============================================================== The ``-k`` option exists for sites where SSL certificate interception undermines fetching from github and https hosted source tarballs. When enabled, ``uberenv.py`` clones spack using: @@ -243,7 +243,7 @@ Default invocation on OSX: python scripts/uberenv/uberenv.py --prefix uberenv_libs \ --spec %clang \ - --spack-config-dir scripts/uberenv/spack_configs/darwin/ + --spack-config-dir scripts/uberenv_configs/spack_configs/configs/darwin/ The uberenv `--install` installs conduit\@develop (not just the development dependencies): diff --git a/src/examples/docker/ubuntu/Dockerfile b/src/examples/docker/ubuntu/Dockerfile index 4985d463f..67654aa58 100644 --- a/src/examples/docker/ubuntu/Dockerfile +++ b/src/examples/docker/ubuntu/Dockerfile @@ -55,7 +55,7 @@ RUN tar -xf conduit.docker.src.tar RUN cd conduit && python scripts/uberenv/uberenv.py \ -k \ --spec "%gcc+mpi~doc~silo" \ - --spack-config-dir=scripts/uberenv_configs/spack_configs/docker/ubuntu/ + --spack-config-dir=scripts/uberenv_configs/spack_configs/configs/docker/ubuntu/ # configure a debug build with cmake RUN cd conduit && mkdir build-debug