Permalink
Browse files

More orcid, comment omp printing, fix gpudfcc internal build

  • Loading branch information...
loriab committed Jun 27, 2018
1 parent df0e368 commit 618cd843618edb82d01382e7aec4196f28cd9dcc
@@ -14,7 +14,6 @@
"additionalName": "M.",
"familyName": "Parrish",
"affiliation": "Center for Computational Molecular Science and Technology, Georgia Institute of Technology",
"@id": "https://orcid.org/0000-",
"@id": "https://github.com/robparrish"
},
{
@@ -50,7 +49,7 @@
"additionalName": "Eugene",
"familyName": "DePrince",
"affiliation": "Department of Chemistry and Biochemistry, Florida State University",
"@id": "https://orcid.org/0000-",
"@id": "https://orcid.org/0000-0003-1061-2521",
"@id": "https://github.com/edeprince3"
},
{
@@ -60,14 +59,14 @@
"familyName": "Hohenstein",
"affiliation": "Department of Chemistry and Biochemistry, The City College of New York",
"@id": "https://orcid.org/0000-0002-2119-2959",
"@id": "https://github.com/????"
"@id": "https://github.com/ehohenstein2"
},
{
"@type": "Person",
"givenName": "U\u0223ur",
"familyName": "Bozkaya",
"affiliation": "Department of Chemistry, Hacettepe University, Turkey",
"@id": "https://orcid.org/0000-",
"@id": "https://orcid.org/0000-0002-5203-2210",
"@id": "https://github.com/bozkaya"
},
{
@@ -101,7 +100,7 @@
"additionalName": "F.",
"familyName": "Gonthier",
"affiliation": "Center for Computational Molecular Science and Technology, Georgia Institute of Technology",
"@id": "https://orcid.org/0000-",
"@id": "https://orcid.org/0000-0002-2933-4085",
"@id": "https://github.com/jgonthier"
},
{
@@ -110,7 +109,7 @@
"additionalName": "M.",
"familyName": "James",
"affiliation": "Department of Chemistry, Virginia Tech",
"@id": "https://orcid.org/0000-",
"@id": "https://orcid.org/0000-0001-5821-6064",
"@id": "https://github.com/amjames"
},
{
@@ -119,7 +118,6 @@
"additionalName": "R.",
"familyName": "McAlexander",
"affiliation": "Department of Chemistry, Virginia Tech",
"@id": "https://orcid.org/0000-",
"@id": "https://github.com/harls"
},
{
@@ -135,7 +133,6 @@
"givenName": "Masaaki",
"familyName": "Saitow",
"affiliation": "Department of Chemistry and Research Center for Smart Molecules, Rikkyo University, Japan",
"@id": "https://orcid.org/0000-",
"@id": "https://github.com/msaitow"
},
{
@@ -151,16 +148,15 @@
"givenName": "Benjamin",
"additionalName": "P.",
"familyName": "Pritchard",
"affiliation": "Center for Computational Molecular Science and Technology, Georgia Institute of Technology",
"@id": "https://orcid.org/0000-",
"affiliation": "The Molecular Sciences Software Institute",
"@id": "https://github.com/bennybp"
},
{
"@type": "Person",
"givenName": "Prakash",
"familyName": "Verma",
"affiliation": "Department of Chemistry, Emory University",
"@id": "https://orcid.org/0000-",
"@id": "https://orcid.org/0000-0003-3048-9380",
"@id": "https://github.com/PrakashVermaQTP"
},
{
@@ -264,7 +260,6 @@
"additionalName": "C.",
"familyName": "Schieber",
"affiliation": "Center for Computational Molecular Science and Technology, Georgia Institute of Technology",
"@id": "https://orcid.org/0000-",
"@id": "https://github.com/schiebermc"
},
{
@@ -38,9 +38,9 @@ if(NOT TARGET tgt::MathOpenMP)
find_package(MathOpenMP)
endif()
include(CMakePrintHelpers)
cmake_print_properties(TARGETS OpenMP::OpenMP_C OpenMP::OpenMP_CXX OpenMP::OpenMP_Fortran OpenMP::OpenMP tgt::MathOpenMP lapack
PROPERTIES INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRS INTERFACE_LINK_LIBRARIES)
#include(CMakePrintHelpers)
#cmake_print_properties(TARGETS OpenMP::OpenMP_CXX OpenMP::OpenMP tgt::MathOpenMP lapack
# PROPERTIES INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRS INTERFACE_LINK_LIBRARIES)
get_property(_ill TARGET lapk PROPERTY INTERFACE_LINK_LIBRARIES)
list(GET _ill 0 _ill0)
@@ -97,7 +97,7 @@ endif()
if (ENABLE_OPENMP)
# *not* REQUIRED b/c some compilers don't support OpenMP and -DENABLE_OPENMP isn't a build-or-die-trying
find_package(TargetOpenMP COMPONENTS ${TargetOpenMP_FIND_COMPONENTS})
find_package(TargetOpenMP QUIET COMPONENTS ${TargetOpenMP_FIND_COMPONENTS})
endif()
set(PN MathOpenMP)
@@ -24,7 +24,7 @@ if(NOT TARGET tgt::lapack)
get_property(_illl TARGET tgt::lapk PROPERTY INTERFACE_LINK_LIBRARIES)
get_property(_illb TARGET tgt::blas PROPERTY INTERFACE_LINK_LIBRARIES)
include(CMakePrintHelpers)
cmake_print_properties(TARGETS OpenMP::OpenMP_C OpenMP::OpenMP_CXX OpenMP::OpenMP_Fortran OpenMP::OpenMP tgt::MathOpenMP tgt::lapack
PROPERTIES INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRS INTERFACE_LINK_LIBRARIES)
#include(CMakePrintHelpers)
#cmake_print_properties(TARGETS OpenMP::OpenMP_C OpenMP::OpenMP_CXX OpenMP::OpenMP_Fortran OpenMP::OpenMP tgt::MathOpenMP tgt::lapack
# PROPERTIES INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_OPTIONS INTERFACE_INCLUDE_DIRS INTERFACE_LINK_LIBRARIES)
endif()
@@ -34,7 +34,7 @@ if(${ENABLE_gpu_dfcc})
CMAKE_CACHE_ARGS -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-DCMAKE_CUDA_FLAGS:STRING=${CMAKE_CUDA_FLAGS}
-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
-DCMAKE_PREFIX_PATH:PATH=${STAGED_INSTALL_PREFIX}
INSTALL_COMMAND DESTDIR=${CMAKE_BINARY_DIR}/stage ${CMAKE_MAKE_PROGRAM} install)
set(gpu_dfcc_DIR ${STAGED_INSTALL_PREFIX}/share/cmake/gpu_dfcc CACHE PATH "path to internally built gpu_dfccConfig.cmake" FORCE)

0 comments on commit 618cd84

Please sign in to comment.