Skip to content

Commit

Permalink
Release 1.2.5 (#11)
Browse files Browse the repository at this point in the history
* fixed some issues Hoby found

* print out Boost_LIBRARIES (may be null)

* set include_dirs if Boost_LIBRARIES is not defined

* Fix incorrect data type for non constant array

* If we are using cmake >= 3.15, prefer config files over modules for package discovery

* include some missing files

* update instructions

* Add -Wall -Werror flags

* make functions static instead of using anonymous namespace to enforce ODR and avoid compiler warning

* fix indentation

* Put in the 'unused' attribute to get around the gcc 7.3.0 warning about an unused function

* Check if LAPACKE is found ONLY if LAPACKE is enabled

* set some Pkg_ROOT vars if they are not set

* more tweaks to set Boost_ROOT correctly

* more tweaks to set Boost_ROOT correctly

* fix logic for LAPACKE error output

* Set ENABLE_Jali

* use target properties instead of global include and library definitions

* comment out some definitions that should not be needed if wonton is a properly defined target

* no need for ARCHOS

* add wonton to library list (in the hopes it will recognize it as a target)

* use target properties instead of global include and library definitions

* no need for ARCHOS

* changes to minimize use of cinch

* changes to minimize use of cinch

* rework cmake system to use targets and dependencies

* rework to use target based system and better exporting of config and targets

* renamed and reworked to find dependencies etc

* update Jali and cmake versions

* move mesh tests into CMakeLists.txt for particular wrappers; clarify library dependencies; use wonton_LIBRARIES instead of wonton_TARGETS

* can only set INTERFACE properties on top level wonton INTERFACE type library

* Add explicit ENABLE_Jali flag and use Jali_ROOT to indicate where Jali lives

* set ENABLE_Jali=True and Jali_ROOT var instead of Jali_DIR

* fix arguments for endif

* add project(state) so that tests are created under state subdir; cleanup

* make jali_state_wrapper test a parallel test running on 1 thread

* error in Jali version

* fixed more instances of using PUBLIC dependencies instead of INTERFACE for INTERFACE only wonton library

* make wonton_support a dependency for each of the subdirectory targets

* Thrust specifications have changed

* simplify checking for compiler standards and setting MPI dependencies

* removed unnecessary header declarations to minimize setting of variables

* simplified enforcement of compiler standard

* change r2d dir name to r3d

* Rework LAPACKE search and linking

* fix error that crept into Jali_ROOT filepath

* don't allow enabling of jali when MPI is off

* USE_LAPACKE changed to ENABLE_LAPACKE to be consistent with other flags

* eliminate some debug prints

* fix some mismatched parenthetical statements

* test invocation of Wonton based thrust declarations and functions

* add thrust_test and rework OpenMP dependency definition so that the compile definitions are brought along too

* fix FOR_EACH test to use lambda instead of functor

* change test_matfuncs to a serial test - making it a parallel test kicked up strange MPI_C++ interface errors

* add OMPI_SKIP_MPICXX compile definition and fix source path for installation of config files

* directly install header files because we cannot yet set PUBLIC_HEADER property on INTERFACE targets

* minor fixes to get the wonton config file to write out correctly

* Restore test to serial test

* forgot to add wonton_state as dependency of wonton

* move the WONTON_LIBRARIES name to the top where the library is being defined

* correct the path for the input files so that they are retrieved from the wonton_SOURCE_DIR and not the project they are included in

* Make sure the specified THRUST_ROOT dir actually has thrust files

* module for finding NVidia Thrust

* Find Thrust using package and incorporate the dependency finding into wontonConfig.cmake so downstream packages can also find it

* cleanup

* write to wontonTargets.cmake to make consistent with wontonConfig.cmake naming convention

* change wonton-targets.cmake to wontonTargets.cmake

* set the WONTON_LIBRARIES var so it can be exported

* fix target_include_directories for Wonton when used as a submodule

* fix typo

* add the cache variable WONTON_ENABLE_MPI so it gets written into the config file

* add MPI as a dependency of wonton_support for building

* added to comments

* make WONTON_LIBRARIES cache variable so it is visible globally while building

* find MPI also if enabled

* remove empty variable

* fix typo in thrust include dirs

* HOST_BACKEND --> DEVICE_BACKEND

* use WONTON_ENABLE_THRUST; ENABLE_THRUST is not defined

* turn off cinch module path parsing

* check for WONTON_ENABLE_THRUST not ENABLE_THRUST and minor tweaks

* Make the names of the various ENABLE_OPTION variables (like ENABLE_LAPACKE, WONTON_ENABLE_MPI) consistent

* scrap the idea of not having the auto-generated wonton-config.h file in the build dir - we need it

* fix the endif clauses

* forgot to change the header file name back

* force overwrite of critical CACHE variables

* fix errors in FleCSI wrappers CMake

* more fixes to CMake

* remove flecsi from this level

* fix typo and variable in FleCSI section

* extract FindFleCSI from cinch

* Force WONTON_ENABLE_THRUST variable to be overwritten when Thrust is on

* Add a HWLOC target and set it up more elaborately as an imported library

* Add proper Kokkos package finding mechanism; Prefix all ENABLE_* options with WONTON_

* Fix to avoid compilation warnings when WONTON_ENABLE_FEAT is defined in the header file and as a compile definition

* make kokkos a dependency of wonton_support

* changed all ENABLE_FEATURE to WONTON_ENABLE_FEATURE

* incorporate Kokkos as a TPL

* Add Kokkos related variables and find Kokkos

* Make Kokkos_LIBRARIES a dependency of wonton_support

* account change in option syntax from ENABLE_opt to WONTON_ENABLE_opt

* upgrade Jali to 1.1.4

* switch Boost dependency to INTERFACE from PUBLIC

* fix test to use right type for counting iterator

* remove setting of CMAKE_C_COMPILER AND CMAKE_CXX_COMPILER - pickup from environment

* print out Boost_LIBRARIES (may be null)

* set include_dirs if Boost_LIBRARIES is not defined

* If we are using cmake >= 3.15, prefer config files over modules for package discovery

* include some missing files

* update instructions

* Add -Wall -Werror flags

* make functions static instead of using anonymous namespace to enforce ODR and avoid compiler warning

* fix indentation

* Put in the 'unused' attribute to get around the gcc 7.3.0 warning about an unused function

* Check if LAPACKE is found ONLY if LAPACKE is enabled

* set some Pkg_ROOT vars if they are not set

* more tweaks to set Boost_ROOT correctly

* fix logic for LAPACKE error output

* fix comment string

* replace bare ENABLE_Feature with WONTON_ENABLE_* wherever it was missed

* update version number

* Fix incorrect guard symbols

* Fix clang-tidy warnings

* Fix missing header leading to clang error

* Force the settings for cache variables

* CMake's FindBoost gets unhappy if we set Boost_ROOT; only set BOOST_ROOT

CMake's FindBoost gets unhappy if we set Boost_ROOT; only set BOOST_ROOT

* Fix unused matrix

* Fix inconsistent guard symbol

* Fix error-prone initializations

* Fix inlining issue

* Fix braces around scalar issue

* Ignore installation files

* Move files and update qualifiers

* Minor fixes

* Remove unnecessary headers

* Fix include guard

* Fix sign-comparison warning

* Fix headers inclusion ordering

* Fix warnings

* Fix Boost link issue

* Fix last issue

* Fix sign-comparison issue

* yaml file and script for matrix install of wonton HEAD on varan

* add kokkos options

* add kokkos as build_type

* fix kokkos dir

* use BRANCH_NAME environment variable instead of trying to find it ourselves

* remove && between shell commands as we already used 'set -e' to exit on error

* setup packages and functions for adding tests using wonton_add_unit

* add support for use of google test package without cinch

* replace cinch_add_unit with wonton_add_unit

* removed cinch as submodule

* special MPI test driver (google test does not furnish one)

* use relative path so that we don't have to fetch googletest from github

* moved to CMakeLists.txt at top level

* replaced by code from config/project.cmake

* fix comment format

* add aliases for gtest and gtest_main, rename the function

* replace PROJECT_SOURCE_DIRECTORY (which refers to the local subdirectory project) with wonton_SOURCE_DIR which is the top level for the wonton project

* remove all references to cinch

* Revert "use relative path so that we don't have to fetch googletest from github"

This reverts commit c0aa33d.

* add flecsi install options

* switch googletest submodule path to be relative

* fix googletest path

* need C language to be enabled to activate FortranC interface for LAPACKE

* guard parallel test with if WONTON_ENABLE_MPI statement

* include algorithm.h for std::for_each

* use SERIAL policy for serial tests

* Bump up minor version number in file

* Extract macro from 'cinch'

* Enable doxygen target generation

* Tag and update patch number

* Remove 'documentation.cmake'

* Include headers as system ones

* Fix install directories and flags

* Fix internal warnings

* Annotate headers as system ones

* Split the least square system construction

* Allow to compute the gradient using the cached inverse matrix

* Retrieve the initial matrix and verify the coordinate system

* Solve the algebraic equation by default for single variable

* Minor fixes and cleanup

* Include right hand side recomputation

* Avoid rescaling of the gradient vector

* Use a QR decomposition method if no LAPACK

* Fix flaw in CMake when enabling LAPACKE

* Minor update on matrices construction method

* Add an option to invert (A^T.A) or not

* Minor fixes

* Fix issues found by Portage

* Make version parametric in install script

* Add tag and increment patch number

* update to reflect compilers and settings for HPC

* clean up

* Added more moments to polygons to address RZ geometry.

* matrix yaml files for HPC machines

* fix paths for HPC

* correct version of intel compiler on varan

* Fake commit.

* Second step in Rao's implementatino plan.

* Templated volume calculation on coordinate system.

* Replace #ifdef DEBUG with #ifndef NDEBUG and use static declaration instead of anonymous namespace to honor ODR

* Make static method inline

* Minimum-intrusive change of constructors.

* Explicit handling of missing modules

* Fix for failing builds on Snow

* Also updating readme builds on Varan

* Renaming machine for snow

* Remove extra checks from varan builds

* Update in-code documentation. Renamed enum.

* add alternate form of constructor and eliminate specializations

* consolidated cell volume and centroid computation into one

* correct the checks on number of vertices

* minor fixes to comments

* avoid computing approximate cell centroids (aka geometric center) for all cells; calculate it only when the volume of a cell is nearly zero

* Update to 1.8.1

Co-authored-by: Danny Shevitz <shevitz@lanl.gov>
Co-authored-by: Hoby Rakotoarivelo <hoby@lanl.gov>
Co-authored-by: Rao Garimella <rao@abyzou.lanl.gov>
Co-authored-by: lipnikov <lipnikov@lanl.gov>
Co-authored-by: Eugene Kikinzon <kikinzon@lanl.gov>
  • Loading branch information
6 people authored Jan 6, 2021
1 parent d643221 commit 4caf172
Show file tree
Hide file tree
Showing 24 changed files with 629 additions and 265 deletions.
12 changes: 3 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ endif ()

set(WONTON_VERSION_MAJOR 1)
set(WONTON_VERSION_MINOR 2)
set(WONTON_VERSION_PATCH 1)
set(WONTON_VERSION_PATCH 2)


# Top level target
Expand Down Expand Up @@ -95,8 +95,8 @@ if (WONTON_ENABLE_FleCSI AND NOT FleCSI_LIBRARIES)
message(STATUS "FleCSI_LIBRARIES=${FleCSI_LIBRARIES}" )
message(STATUS "FleCSISP_LIBRARIES=${FleCSISP_LIBRARIES}" )

target_include_directories(wonton INTERFACE ${FleCSI_INCLUDE_DIR})
target_include_directories(wonton INTERFACE ${FleCSISP_INCLUDE_DIR})
target_include_directories(wonton SYSTEM INTERFACE ${FleCSI_INCLUDE_DIR})
target_include_directories(wonton SYSTEM INTERFACE ${FleCSISP_INCLUDE_DIR})

target_link_libraries(wonton INTERFACE ${FleCSI_LIBRARIES})
target_link_libraries(wonton INTERFACE ${FleCSISP_LIBRARIES})
Expand Down Expand Up @@ -341,12 +341,6 @@ if (WONTON_ENABLE_LAPACKE)
enable_language(Fortran)
include(FortranCInterface) # will ensure the fortran library is linked in


target_include_directories(wonton INTERFACE ${LAPACKE_INCLUDE_DIRS})
target_compile_definitions(wonton INTERFACE WONTON_HAS_LAPACKE)

target_link_libraries(wonton INTERFACE ${LAPACKE_LIBRARIES})

message(STATUS "LAPACKE_FOUND ${LAPACKE_FOUND}")
message(STATUS "LAPACKE_LIBRARIES ${LAPACKE_LIBRARIES}")

Expand Down
29 changes: 29 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,32 @@ cmake \
make -j2
ctest --output-on-failure
```

## Snow

Execute the following from the Wonton root directory:

```c++
# machine=sn-fey
module load intel/18.0.5 openmpi/2.1.2 cmake/3.14.0
NGC=/usr/projects/ngc
NGC_INCLUDE_DIR=$NGC/private/include
JALI_INSTALL_PREFIX=$NGC/private/jali/1.1.4-intel-18.0.5-openmpi-2.1.2
LAPACKE_INSTALL_PREFIX=$NGC/private/lapack/3.8.0-patched-intel-18.0.5
mkdir build
cd build
cmake \
-D CMAKE_PREFIX_PATH=$NGC_INCLUDE_DIR \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_CXX_FLAGS="-Wall -Werror" \
-D ENABLE_UNIT_TESTS=True \
-D WONTON_ENABLE_MPI=True \
-D ENABLE_JENKINS_OUTPUT=True \
-D WONTON_ENABLE_Jali=True \
-D Jali_ROOT:FILEPATH=$JALI_INSTALL_PREFIX \
-D WONTON_ENABLE_LAPACKE=True \
-D LAPACKE_ROOT:FILEPATH=$LAPACKE_INSTALL_PREFIX \
..
make -j36
ctest -j36 --output-on-failure
```
2 changes: 1 addition & 1 deletion googletest
Submodule googletest updated 296 files
18 changes: 18 additions & 0 deletions jenkins/axis_hpc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
COMPILER:
- intel18
- gcc6
- gcc7

BUILD_TYPE:
- base
- debug
- serial
- readme
- thrust

exclude:
- COMPILER: gcc6
BUILD_TYPE: readme
- COMPILER: gcc7
BUILD_TYPE: readme

15 changes: 15 additions & 0 deletions jenkins/axis_hpc_pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
COMPILER:
- intel18
- gcc7

BUILD_TYPE:
- base
- debug
- serial
- readme
- thrust

exclude:
- COMPILER: gcc7
BUILD_TYPE: readme

70 changes: 46 additions & 24 deletions jenkins/build_matrix_entry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,27 @@ compiler=$1
build_type=$2

echo "inside build_matrix entry"

# special case for README builds
if [[ $build_type == "readme" ]]; then
python2 $WORKSPACE/jenkins/parseREADME.py $WORKSPACE/README.md $WORKSPACE
exit
fi
# special case for README builds
if [[ $build_type == "readme" ]]; then

# Put a couple of settings in place to generate test output even if
# the README doesn't ask for it.
export CTEST_OUTPUT_ON_FAILURE=1
CACHE_OPTIONS="-D ENABLE_JENKINS_OUTPUT=True"
sed "s/^ *cmake/& $CACHE_OPTIONS/g" $WORKSPACE/README.md >$WORKSPACE/README.md.1
python2 $WORKSPACE/jenkins/parseREADME.py \
$WORKSPACE/README.md.1 \
$WORKSPACE \
varan
exit

fi

# set modules and install paths

Expand All @@ -35,33 +51,31 @@ thrust_dir=${ngc_include_dir}

# compiler-specific settings
if [[ $compiler == "intel18" ]]; then
intel_version=18.0.1
cxxmodule=intel/${intel_version}
# openmpi version that libs were built against
openmpi_version=2.1.2
# openmpi module for compiling and linking
mpi_module=openmpi/2.1.2
jali_install_dir=$NGC/private/jali/${jali_version}-intel-${intel_version}-openmpi-${openmpi_version}
lapacke_dir=$NGC/private/lapack/${lapack_version}-patched-intel-${intel_version}
elif [[ $compiler == "gcc6" ]]; then
gcc_version=6.4.0
cxxmodule=gcc/${gcc_version}
# openmpi version that libs were built against
compiler_version=18.0.1
cxxmodule=intel/${compiler_version}
compiler_suffix="-intel-${compiler_version}"

openmpi_version=2.1.2
# openmpi module for compiling and linking
mpi_module=openmpi/2.1.2
jali_install_dir=$NGC/private/jali/${jali_version}-gcc-${gcc_version}-openmpi-${openmpi_version}
lapacke_dir=$NGC/private/lapack/${lapack_version}-patched-gcc-${gcc_version}
elif [[ $compiler == "gcc7" ]]; then
gcc_version=7.3.0
cxxmodule=gcc/${gcc_version}
# openmpi version that libs were built against
mpi_suffix="-openmpi-${openmpi_version}"

elif [[ $compiler =~ "gcc" ]]; then

if [[ $compiler == "gcc6" ]]; then
compiler_version=6.4.0
elif [[ $compiler == "gcc7" ]]; then
compiler_version=7.3.0
fi
cxxmodule=gcc/${compiler_version}
compiler_suffix="-gcc-${compiler_version}"

openmpi_version=2.1.2
# openmpi module for compiling and linking
mpi_module=openmpi/2.1.2
jali_install_dir=$NGC/private/jali/${jali_version}-gcc-${gcc_version}-openmpi-${openmpi_version}
lapacke_dir=$NGC/private/lapack/${lapack_version}-patched-gcc-${gcc_version}
mpi_module=openmpi/${openmpi_version}
mpi_suffix="-openmpi-${openmpi_version}"

fi
jali_install_dir=$NGC/private/jali/${jali_version}${compiler_suffix}${mpi_suffix}
lapacke_dir=$NGC/private/lapack/${lapack_version}-patched${compiler_suffix}


# build-type-specific settings
Expand All @@ -80,6 +94,13 @@ elif [[ $build_type == "thrust" ]]; then
thrust_flags="-D WONTON_ENABLE_THRUST=True -DTHRUST_ROOT:FILEPATH=${thrust_dir}"
fi

flecsi_flags="-D WONTON_ENABLE_FleCSI:BOOL=False"
if [[ $compiler == "gcc6" && $build_type != "serial" ]]; then
flecsi_install_dir=$NGC/private/flecsi/374b56b-gcc-6.4.0
flecsisp_install_dir=$NGC/private/flecsi-sp/e78c594-gcc-6.4.0
flecsi_flags="-D WONTON_ENABLE_FleCSI:BOOL=True -D FleCSI_ROOT:PATH=$flecsi_install_dir -D FleCSISP_ROOT:PATH=$flecsisp_install_dir"
fi

export SHELL=/bin/sh

export MODULEPATH=""
Expand All @@ -105,8 +126,9 @@ cmake \
-D ENABLE_JENKINS_OUTPUT=True \
$mpi_flags \
$jali_flags \
$flecsi_flags \
$lapacke_flags \
$thrust_flags \
..
make -j2
ctest --output-on-failure
ctest -j2 --output-on-failure
127 changes: 127 additions & 0 deletions jenkins/build_matrix_entry_hpc.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
#!/usr/bin/env bash
# This script is executed on Jenkins using
#
# $WORKSPACE/jenkins/build_matrix_entry.sh <compiler> <build_type>
#
# The exit code determines if the test succeeded or failed.
# Note that the environment variable WORKSPACE must be set (Jenkins
# will do this automatically).

# Exit on error
set -e
# Echo each command
set -x

compiler=$1
build_type=$2

echo "inside build_matrix entry"

# special case for README builds
if [[ $build_type == "readme" ]]; then

# Put a couple of settings in place to generate test output even if
# the README doesn't ask for it.
export CTEST_OUTPUT_ON_FAILURE=1
CACHE_OPTIONS="-D ENABLE_JENKINS_OUTPUT=True"
sed "s/^ *cmake/& $CACHE_OPTIONS/g" $WORKSPACE/README.md >$WORKSPACE/README.md.1
python2 $WORKSPACE/jenkins/parseREADME.py \
$WORKSPACE/README.md.1 \
$WORKSPACE \
sn-fey
exit

fi

# set modules and install paths

jali_version=1.1.4
lapack_version=3.8.0

export NGC=/usr/projects/ngc
ngc_include_dir=$NGC/private/include

thrust_dir=${ngc_include_dir}


# compiler-specific settings
if [[ $compiler == "intel18" ]]; then
compiler_version=18.0.5
cxxmodule=intel/${compiler_version}
compiler_suffix="-intel-${compiler_version}"

openmpi_version=2.1.2
mpi_module=openmpi/2.1.2
mpi_suffix="-openmpi-${openmpi_version}"

elif [[ $compiler =~ "gcc" ]]; then

if [[ $compiler == "gcc6" ]]; then
compiler_version=6.4.0
elif [[ $compiler == "gcc7" ]]; then
compiler_version=7.4.0
fi
cxxmodule=gcc/${compiler_version}
compiler_suffix="-gcc-${compiler_version}"

openmpi_version=2.1.2
mpi_module=openmpi/${openmpi_version}
mpi_suffix="-openmpi-${openmpi_version}"

fi
jali_install_dir=$NGC/private/jali/${jali_version}${compiler_suffix}${mpi_suffix}
lapacke_dir=$NGC/private/lapack/${lapack_version}-patched${compiler_suffix}


# build-type-specific settings
cmake_build_type=Release
mpi_flags="-D WONTON_ENABLE_MPI=True"
extra_flags=
thrust_flags=
jali_flags="-D WONTON_ENABLE_Jali=True -D Jali_ROOT:FILEPATH=$jali_install_dir"
lapacke_flags="-D WONTON_ENABLE_LAPACKE=True -D LAPACKE_ROOT:FILEPATH=$lapacke_dir"
if [[ $build_type == "debug" ]]; then
cmake_build_type=Debug
elif [[ $build_type == "serial" ]]; then
mpi_flags=
jali_flags= # jali is not available in serial
elif [[ $build_type == "thrust" ]]; then
thrust_flags="-D WONTON_ENABLE_THRUST=True -DTHRUST_ROOT:FILEPATH=${thrust_dir}"
fi

# We don't seem to have a suitable (read as "ancient") flecsi install on HPC
#if [[ $compiler == "gcc6" && $build_type != "serial" ]]; then
# flecsi_install_dir=$NGC/private/flecsi/374b56b-gcc-6.4.0
# flecsisp_install_dir=$NGC/private/flecsi-sp/e78c594-gcc-6.4.0
# flecsi_flags="-D WONTON_ENABLE_FleCSI:BOOL=True -D FleCSI_ROOT:PATH=$flecsi_install_dir -D FleCSISP_ROOT:PATH=$flecsisp_install_dir"
#fi

export SHELL=/bin/sh
#Rely on default user environment to load modules; these scripts can be found in /etc/profile.d/ as of 8/25/20 the scripts that set up modules on snow are /etc/profile.d/z00_lmod.sh; /etc/profile.d/00-modulepath.sh; /etc/profile.d/z01-modules.lanl.sh;
module load $cxxmodule
if [[ -n "$mpi_flags" ]]; then
module load ${mpi_module}
fi
module load cmake/3.14.0 # 3.13 or higher is required

echo $WORKSPACE
cd $WORKSPACE

mkdir build
cd build

cmake \
-D CMAKE_BUILD_TYPE=$cmake_build_type \
-D CMAKE_CXX_FLAGS="-Wall -Werror" \
-D CMAKE_PREFIX_PATH=$ngc_include_dir \
-D ENABLE_UNIT_TESTS=True \
-D ENABLE_APP_TESTS=True \
-D ENABLE_JENKINS_OUTPUT=True \
$mpi_flags \
$jali_flags \
$flecsi_flags \
$lapacke_flags \
$thrust_flags \
..
make -j36
ctest -j36 --output-on-failure
6 changes: 4 additions & 2 deletions jenkins/install_matrix_entry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export NGC=/usr/local/codes/ngc
ngc_include_dir=$NGC/private/include

wonton_install_dir=$NGC/private/wonton
wonton_version=dev
wonton_version=$3

thrust_dir=${ngc_include_dir}

Expand Down Expand Up @@ -67,9 +67,11 @@ jali_flags="-D WONTON_ENABLE_Jali:BOOL=True -D Jali_ROOT:PATH=$jali_install_dir"
lapacke_dir=$NGC/private/lapack/${lapack_version}-patched${compiler_suffix}
lapacke_flags="-D WONTON_ENABLE_LAPACKE:BOOL=True -D LAPACKE_ROOT:PATH=$lapacke_dir"

flecsi_flags="-D WONTON_ENABLE_FleCSI:BOOL=False"
if [[ $compiler == "gcc6" ]]; then
flecsi_install_dir=$NGC/private/flecsi/374b56b-gcc-6.4.0
flecsi_flags="-D WONTON_ENABLE_FleCSI:BOOL=True -D FleCSI_ROOT:PATH=$flecsi_install_dir"
flecsisp_install_dir=$NGC/private/flecsi-sp/e78c594-gcc-6.4.0
flecsi_flags="-D WONTON_ENABLE_FleCSI:BOOL=True -D FleCSI_ROOT:PATH=$flecsi_install_dir -D FleCSISP_ROOT:PATH=$flecsisp_install_dir"
fi


Expand Down
Loading

0 comments on commit 4caf172

Please sign in to comment.