Changeset 28270


Ignore:
Timestamp:
05/10/24 14:19:25 (11 months ago)
Author:
jdquinn
Message:

BUG: Patch for latest versions of gcc

Location:
issm/trunk-jpl/externalpackages/dakota
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-discover.sh

    r28180 r28270  
    11#!/bin/bash
    22set -eu
     3
     4
     5## Constants
     6#
     7VER="6.2"
    38
    49#Some cleanup
    … …  
    3439cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    3540
    36 #Apply patches
    37 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.discover.patch
    38 patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.discover20.patch
     41# Patch source
     42patch ${DAK_SRC}/src/dakota_data_io.hpp configs/${VER}/src/dakota_data_io.hpp.patch
     43patch ${DAK_SRC}/cmake/BuildDakotaCustom.cmake configs/${VER}/BuildDakotaCustom.cmake.discover.patch
     44patch ${DAK_SRC}/CMakeLists.txt configs/${VER}/CMakeLists.txt.discover20.patch
    3945
    4046

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-ghub-workspace_10.sh

    r28034 r28270  
    5555cp configs/${VER}/linux/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    5656
     57# Patch source
     58patch ${DAK_SRC}/src/dakota_data_io.hpp configs/${VER}/src/dakota_data_io.hpp.patch
     59
    5760# Disable requirement of Python 2 for TriBITS
    5861sed -i'' -e 's|SET(PythonInterp_FIND_VERSION|#SET(PythonInterp_FIND_VERSION|' ${DAK_SRC}/packages/teuchos/cmake/tribits/package_arch/TribitsFindPythonInterp.cmake

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh

    r28180 r28270  
    5454cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    5555
     56# Patch source
     57patch ${DAK_SRC}/src/dakota_data_io.hpp configs/${VER}/src/dakota_data_io.hpp.patch
     58
    5659# Disable requirement of Python 2 for TriBITS
    5760sed -i'' -e 's|SET(PythonInterp_FIND_VERSION|#SET(PythonInterp_FIND_VERSION|' ${DAK_SRC}/packages/teuchos/cmake/tribits/package_arch/TribitsFindPythonInterp.cmake

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh

    r28180 r28270  
    5151cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    5252
     53# Patch source
     54patch ${DAK_SRC}/src/dakota_data_io.hpp configs/${VER}/src/dakota_data_io.hpp.patch
     55
    5356# Disable requirement of Python 2 for TriBITS
    5457sed -i'' -e 's|SET(PythonInterp_FIND_VERSION|#SET(PythonInterp_FIND_VERSION|' ${DAK_SRC}/packages/teuchos/cmake/tribits/package_arch/TribitsFindPythonInterp.cmake

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-lonestar.sh

    r28180 r28270  
    11#!/bin/bash
    22set -eu
     3
     4
     5## Constants
     6#
     7VER="6.2"
    38
    49#Some cleanup
    … …  
    3540cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    3641
    37 #Apply patches
    38 patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.lonestar.patch
    39 patch src/src/DakotaInterface.cpp configs/6.2/DakotaInterface.patch
     42# Patch source
     43patch ${DAK_SRC}/src/dakota_data_io.hpp configs/${VER}/src/dakota_data_io.hpp.patch
     44patch ${DAK_SRC}/CMakeLists.txt configs/${VER}/CMakeLists.txt.lonestar.patch
     45patch ${DAK_SRC}/src/DakotaInterface.cpp configs/${VER}/DakotaInterface.patch
     46
     47
    4048
    4149#Configure dakota

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh

    r28180 r28270  
    5858cp configs/${VER}/mac/cmake/InstallDarwinDylibs.cmake ${DAK_SRC}/cmake
    5959
     60# Patch source
     61patch ${DAK_SRC}/src/dakota_data_io.hpp configs/${VER}/src/dakota_data_io.hpp.patch
     62
    6063# Uncomment to copy the following customized source files if using C99 or later
    6164# standard. If uncommented, adding -Wno-error=implicit-function-declaration

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh

    r28180 r28270  
    5454# Copy customized source and configuration files specific to Mac to 'src' directory
    5555cp configs/${VER}/mac/cmake/InstallDarwinDylibs.cmake ${DAK_SRC}/cmake
     56
     57# Patch source
     58patch ${DAK_SRC}/src/dakota_data_io.hpp configs/${VER}/src/dakota_data_io.hpp.patch
    5659
    5760# Disable requirement of Python 2 for TriBITS

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-pleiades.sh

    r28179 r28270  
    4545cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    4646
     47# Patch source
     48patch ${DAK_SRC}/src/dakota_data_io.hpp configs/${VER}/src/dakota_data_io.hpp.patch
     49
    4750# Configure
    4851cd ${DAK_BUILD}

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-pleiades_toss4.sh

    r28179 r28270  
    4545cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    4646
     47# Patch source
     48patch ${DAK_SRC}/src/dakota_data_io.hpp configs/${VER}/src/dakota_data_io.hpp.patch
     49
    4750# Configure
    4851cd ${DAK_BUILD}

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-stallo.sh

    r23790 r28270  
    11#!/bin/bash
    22set -eu
     3
     4
     5## Constants
     6#
     7VER="6.2"
    38
    49#Some cleanup
    … …  
    2530export MPIHOME=/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/
    2631
    27 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
    28 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.stallo.patch
    29 patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
    30 patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.stallo.patch
     32cp ${DAK_SRC}/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
    3133
    32 #Apply patches
    33 patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch
    34 patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch
    35 patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch
    36 patch src/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp configs/6.2/NKM_KrigingModel.patch
    37 patch src/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp configs/6.2/MainEffectsExcelOutput.patch
    38 patch src/src/DakotaInterface.cpp configs/6.2/DakotaInterface.patch
     34# Patch source
     35patch ${DAK_SRC}/cmake/BuildDakotaCustom.cmake configs/${VER}/BuildDakotaCustom.cmake.stallo.patch
     36patch ${DAK_SRC}/cmake/DakotaDev.cmake configs/${VER}/DakotaDev.cmake.patch
     37patch ${DAK_SRC}/CMakeLists.txt configs/${VER}/CMakeLists.txt.stallo.patch
     38patch ${DAK_SRC}/src/dakota_data_io.hpp configs/${VER}/src/dakota_data_io.hpp.patch
     39patch ${DAK_SRC}/src/NonDSampling.cpp configs/${VER}/NonDSampling.cpp.patch
     40patch ${DAK_SRC}/src/NonDLocalReliability.cpp configs/${VER}/NonDLocalReliability.cpp.patch
     41patch ${DAK_SRC}/packages/pecos/src/pecos_global_defs.hpp configs/${VER}/pecos_global_defs.hpp.patch
     42patch ${DAK_SRC}/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp configs/${VER}/NKM_KrigingModel.patch
     43patch ${DAK_SRC}/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp configs/${VER}/MainEffectsExcelOutput.patch
     44patch ${DAK_SRC}/src/DakotaInterface.cpp configs/${VER}/DakotaInterface.patch
    3945
    4046#Configure dakota
Note: See TracChangeset for help on using the changeset viewer.