Resolve "Create TriBITS Build Alongside Raw CMake Build" #173

jmgate · 2020-03-09T19:10:17Z

This is a WIP PR to address #171. Not ready for review or merge.

kuberry · 2020-03-10T20:35:20Z

Hi @jmgate, we have a condition where either CUSOLVER+CUBLAS will be needed, BLAS+LAPACK, or MKL. All of these are optional, but at least one of these sets of tools must be available. I think we need to verify the user has some combination that will work, but we can't specify what combination that would be (although for Cuda, it does imply CUBLAS).

jmgate · 2020-04-20T22:16:41Z

@kuberry, this is ready for you to play around with. To test things out, I'd:

Merge Resolve "Create Script to Snapshot Compadre into Trilinos" #176 into master.
Rebase this branch on top of master.
Create a branch off of develop in Trilinos.
mkdir -p packages/compadre.
In the Compadre root, ./scripts/snapshot_into_trilinos.py --trilinos-dir /path/to/Trilinos.
Create a build directory.
Modify the trilinos-config.sh to fill in the appropriate paths.
Run that script, make, and ctest.
Adjust settings in CMakeLists.txt until the tests pass.

Let me know when things look good on your end, because there's one more file we need to tweak in Trilinos when we do the initial snapshot.

kuberry · 2020-04-21T13:11:16Z

Hi @jmgate, I'm just going to drop a list here of things we discussed:

Ability to move files from copied location in compadre folder in Trilinos/packages and create an additional commit to that effect during snapshotting
Dealing with either LAPACK+BLAS, or MKL, or CUBLAS+CUSOLVER (as long as 1 of 3 is available)
Mpiexec shouldn't be called to run examples. All examples/tests in repo are single processor (OpenMP for multicore) [This is the reason tests are failing]
I will try to get Compadre_Config.h.in to be produced automatically
I will put glob in for src header/source files
I will make Version.cmake to be version used by CMakeLists.txt for raw CMake build

I'll add more as I think of them.

Probably need to fix this file. Looks like it needs to be automatically generated. Need to investigate project variables.

jmgate · 2020-04-21T13:14:40Z

For the mpiexec bit, with tribits_add_test() you can specify the number of cores to use with NUM_MPI_PROCS 1.

BTW, I just rebased this on top of master so it's all up-to-date.

kuberry · 2020-04-21T14:08:54Z

If the only two files needed in the root of the repo are Version.cmake and TPLLists.cmake, then I'll mark "Ability to move files from copied location in compadre folder in Trilinos/packages and create an additional commit to that effect during snapshotting" as done. I'm going to reuse Version.cmake, so it can stay there. For TPLLists.cmake, I'll probably add a commented out section in there later explaining the dependencies of the package and how the code is for Trilinos, but how a user can specify these needed things if they using a raw CMake build.

both mpi and serial for COMM. Changed python based tests to use PYTHON_EXECUTABLE and to be created as an advanced tests which allows for avoiding the call to python by mpiexec. Compadre_Config.h is now produced using bob features for both raw CMake and Tribits build. Modified bob call to allow for a module name rather than it being hard coded for ${PROJECT_NAME}.

kuberry · 2020-04-21T23:04:08Z

Most recent commit eb4ecec should pass all tests for MPI or serial build of package in Trilinos.

Added flags --porder and --grids to Python examples for raw CMake tests.

so removed as these are already defined in Trilinos/packages root. Version is now defined at the top of CMakeLists.txt Logic for in-Trilinos build set to: Unless specified, Compadre_USE_LAPACK=OFF, Compadre_USE_MKL=OFF, Compadre_USE_CUDA=OFF. This allows enabling any one of the three options explicitly to not interfere with the others (setting Compadre_USE_LAPACK=ON by default would interfere with setting Compadre_USE_MKL=ON as only setting) cmake/Dependencies.cmake now calls for different required packages dependent on Compadre_USE_LAPACK, Compadre_USE_MKL, and Compadre_USE_CUDA

kuberry · 2020-04-22T14:14:46Z

Commit 54ab2b2 handles Compadre_USE_LAPACK, Compadre_USE_MKL, and Compadre_USE_CUDA options (Compadre_USE_LAPACK is default) and will ensure that the correct TPLs are turned on or else will cause Compadre package in Trilinos to be disabled.

…ls isn't a required package for Compadre in Trilinos. Removed TPL_ENABLE_LAPACK and TPL_ENABLE_BLAS from trilinos-configure.sh because these are now enabled automatically by cmake/Dependencies.cmake.

kuberry

@jmgate, I'm good with the way this is behaving and the current PR solves all of the checkbox of issues outlined above.

jmgate · 2020-04-22T14:37:46Z

Yup, this all looks good on my system as well. Thanks for figuring out the last few hurdles, @kuberry. Merge if you're happy with it.

kuberry · 2020-04-22T14:41:29Z

Thanks @jmgate for all of your hard work putting this together!

jmgate added the don't merge Some problem with this request still needs addressed label Mar 9, 2020

jmgate self-assigned this Mar 9, 2020

jmgate marked this pull request as draft April 16, 2020 23:02

jmgate changed the title ~~WIP: Resolve "Create TriBITS Build Alongside Raw CMake Build"~~ Resolve "Create TriBITS Build Alongside Raw CMake Build" Apr 16, 2020

jmgate marked this pull request as ready for review April 20, 2020 22:08

jmgate requested a review from kuberry April 20, 2020 22:08

jmgate removed the don't merge Some problem with this request still needs addressed label Apr 20, 2020

kuberry added the TOOLKIT label Apr 20, 2020

jmgate added 19 commits April 21, 2020 07:11

Add include_tribits_build Macro

821b0c7

Add include_tribits_build() to CMakeLists.txt Files

81efee7

Create *.tribits.cmake Files

a8f2fc8

Add TPL Dependencies

faaedbb

Fill Out src TriBITS File

44639a4

Make KokkosKernels Required

66b4143

Remove CUDA as Required TPL

8d188eb

Add Compadre_config.hpp.in

5a58a0b

Probably need to fix this file. Looks like it needs to be automatically generated. Need to investigate project variables.

Treat nanoflann as Source Header

0d231de

Fix Name of Compadre_Config.h

bf14658

Fix Compadre_Config.h Name

520eb3d

Insert TriBITS Into Root CMakeLists.txt

e4c39ea

Fill Out Root CMakeLists.txt

bf2f12b

Fill Out examples TriBITS File

6e66b2d

Fix LAPACK_Test Name

82c957d

Don't Add Examples Dir

0cd0942

Fix Problems Creating Tests

4cf0d83

Fix String Compare

f8a2976

Add Version.cmake

1807037

jmgate added 8 commits April 21, 2020 07:12

Add settings to CMakeLists.txt

5b38681

Add config script for building in Trilinos

eefb634

Remove Python/Matlab tests

95838ea

Adjust temporary Trilinos configure script

b24a97d

Reformat

698c55d

Remove unneeded lines

979742c

LAPACK_DECLARED_THREADSAFE

e20aad6

Remove Kokkos options that disappeared with 3.1

81cc0d2

kuberry added 3 commits April 21, 2020 17:12

Updated CMakeLists.txt to use Version.cmake for raw CMake build.

d103658

Added flags --porder and --grids to Python examples for raw CMake tests.

Removed cmake/bob.cmake from excludes list for snapshot into Trilinos.

9307f75

Removed KokkosKernels CMake variables from script because KokkosKerne…

4a605ff

…ls isn't a required package for Compadre in Trilinos. Removed TPL_ENABLE_LAPACK and TPL_ENABLE_BLAS from trilinos-configure.sh because these are now enabled automatically by cmake/Dependencies.cmake.

kuberry approved these changes Apr 22, 2020

View reviewed changes

jmgate mentioned this pull request Apr 22, 2020

Create TriBITS Build Alongside Raw CMake Build #171

Closed

5 tasks

kuberry merged commit 5d76dd6 into sandialabs:master Apr 22, 2020

jmgate mentioned this pull request Apr 22, 2020

Insert Compadre into Trilinos #164

Closed

7 tasks

jmgate deleted the 171-create-tribits-build-alongside-raw-cmake-build branch April 22, 2020 14:44

jmgate mentioned this pull request May 6, 2020

Fix Snapshot Unit Test #192

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Resolve "Create TriBITS Build Alongside Raw CMake Build" #173

Resolve "Create TriBITS Build Alongside Raw CMake Build" #173

Uh oh!

jmgate commented Mar 9, 2020

Uh oh!

kuberry commented Mar 10, 2020

Uh oh!

jmgate commented Apr 20, 2020

Uh oh!

kuberry commented Apr 21, 2020 •

edited

Loading

Uh oh!

jmgate commented Apr 21, 2020

Uh oh!

kuberry commented Apr 21, 2020

Uh oh!

kuberry commented Apr 21, 2020

Uh oh!

kuberry commented Apr 22, 2020

Uh oh!

kuberry left a comment

Uh oh!

jmgate commented Apr 22, 2020

Uh oh!

kuberry commented Apr 22, 2020

Uh oh!

Uh oh!

Resolve "Create TriBITS Build Alongside Raw CMake Build" #173

Resolve "Create TriBITS Build Alongside Raw CMake Build" #173

Uh oh!

Conversation

jmgate commented Mar 9, 2020

Uh oh!

kuberry commented Mar 10, 2020

Uh oh!

jmgate commented Apr 20, 2020

Uh oh!

kuberry commented Apr 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jmgate commented Apr 21, 2020

Uh oh!

kuberry commented Apr 21, 2020

Uh oh!

kuberry commented Apr 21, 2020

Uh oh!

kuberry commented Apr 22, 2020

Uh oh!

kuberry left a comment

Choose a reason for hiding this comment

Uh oh!

jmgate commented Apr 22, 2020

Uh oh!

kuberry commented Apr 22, 2020

Uh oh!

Uh oh!

kuberry commented Apr 21, 2020 •

edited

Loading