Skip to content
Snippets Groups Projects
Commit 8a20b0f1 authored by acrovato's avatar acrovato
Browse files

Merge remote-tracking branch 'origin/master' into feat_dss

parents 46eb2e5f e4ae8749
No related branches found
No related tags found
1 merge request!6amfe v1.0.5
Pipeline #5758 passed
Hide whitespace changes
Inline Side-by-side
Showing
with 18 additions and 180 deletions
CMake/FindMPI4PY.cmake deleted 100644 → 0
+ 0
− 42
View file @ 46eb2e5f
# Copyright 2020 University of Liège
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
if(NOT MPI4PY_INCLUDE_DIR)
execute_process(COMMAND
"${PYTHON_EXECUTABLE}" "-c" "import mpi4py; print(mpi4py.get_include())"
OUTPUT_VARIABLE MPI4PY_INCLUDE_DIR
RESULT_VARIABLE MPI4PY_COMMAND_RESULT
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(MPI4PY_COMMAND_RESULT)
message("waves/CMake/FindMPI4PY: mpi4py not found")
set(MPI4PY_FOUND FALSE)
else(MPI4PY_COMMAND_RESULT)
if (MPI4PY_INCLUDE_DIR MATCHES "Traceback")
message("waves/CMake/FindMPI4PY: mpi4py matches traceback")
## Did not successfully include MPI4PY
set(MPI4PY_FOUND FALSE)
else (MPI4PY_INCLUDE_DIR MATCHES "Traceback")
## successful
set(MPI4PY_FOUND TRUE)
set(MPI4PY_INCLUDE_DIR ${MPI4PY_INCLUDE_DIR} CACHE STRING "mpi4py include path")
endif (MPI4PY_INCLUDE_DIR MATCHES "Traceback")
endif(MPI4PY_COMMAND_RESULT)
else(NOT MPI4PY_INCLUDE_DIR)
set(MPI4PY_FOUND TRUE)
endif(NOT MPI4PY_INCLUDE_DIR)
# ----------------------------------------------------------------------------
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(MPI4PY DEFAULT_MSG
MPI4PY_INCLUDE_DIR)
CMake/codeblocks.cmake deleted 100644 → 0
+ 0
− 20
View file @ 46eb2e5f
# Copyright 2020 University of Liège
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#SET(CMAKE_GENERATOR "CodeBlocks - Unix Makefiles" CACHE INTERNAL "" FORCE)
SET(MKL_LIB_PATH "/opt/intel/mkl/lib/intel64;/opt/intel/lib/intel64" CACHE PATH "" FORCE)
SET(MKL_INCLUDE_PATH "/opt/intel/mkl/include" CACHE PATH "" FORCE)
CMake/debian-intel.cmake deleted 100644 → 0
+ 0
− 21
View file @ 46eb2e5f
# Copyright 2020 University of Liège
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
SET(CMAKE_CXX_COMPILER "icpc" CACHE FILEPATH "" FORCE)
SET(CMAKE_C_COMPILER "icc" CACHE FILEPATH "" FORCE)
SET(MKL_LIB_PATH "/opt/intel/composerxe/mkl/lib/intel64;/opt/intel/composerxe/lib/intel64" CACHE PATH "" FORCE)
SET(MKL_INCLUDE_PATH "/opt/intel/composerxe/mkl/include" CACHE PATH "" FORCE)
CMake/debian.cmake deleted 100644 → 0
+ 0
− 20
View file @ 46eb2e5f
# Copyright 2020 University of Liège
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
SET(CMAKE_CXX_COMPILER "icpc" CACHE FILEPATH "" FORCE)
SET(CMAKE_C_COMPILER "icc" CACHE FILEPATH "" FORCE)
SET(MKL_LIB_PATH "/opt/intel/composerxe/mkl/lib/intel64;/opt/intel/composerxe/lib/intel64" CACHE PATH "" FORCE)
SET(MKL_INCLUDE_PATH "/opt/intel/composerxe/mkl/include" CACHE PATH "" FORCE)
CMake/FindNUMPY.cmake → CMake/maclam.cmake
+ 3
− 6
View file @ 8a20b0f1
......@@ -12,10 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
find_path(NUMPY_INCLUDE_DIR "numpy/arrayobject.h")
# "maclam" is the mac of R Boman
# ----------------------------------------------------------------------------
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(NUMPY DEFAULT_MSG
NUMPY_INCLUDE_DIR)
# set custom python
SET(Python3_ROOT_DIR "/Library/Frameworks/Python.framework/Versions/3.7" CACHE PATH "" FORCE)
CMake/spring.cmake deleted 100644 → 0
+ 0
− 24
View file @ 46eb2e5f
# Copyright 2020 University of Liège
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES icpc)
FIND_PROGRAM(CMAKE_C_COMPILER NAMES icc)
# force to look for mkl
SET(BLA_VENDOR "Intel10_64lp" CACHE STRING "" FORCE)
# Trilinos not available on spring
LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
INCLUDE(disable-trilinos)
CMake/ubuntu.cmake deleted 100644 → 0
+ 0
− 23
View file @ 46eb2e5f
# Copyright 2020 University of Liège
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES icpc)
#FIND_PROGRAM(CMAKE_C_COMPILER NAMES icc)
#SET(CMAKE_BUILD_TYPE "Debug" CACHE FILEPATH "" FORCE)
#SET(BLA_VENDOR "Intel10_64lp" CACHE STRING "" FORCE) # useless for cmake 3.5 (xenial)
#SET(SWIG_EXECUTABLE "/home/boman/local/swig3/bin/swig" CACHE FILEPATH "" FORCE)
CMake/gaston-clang-Py3.cmake → CMake/use-clang-compiler.cmake
+ 0
− 5
View file @ 8a20b0f1
......@@ -14,8 +14,3 @@
FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES clang++)
FIND_PROGRAM(CMAKE_C_COMPILER NAMES clang)
# vtk for py3
SET(VTK_DIR "/opt/vtk/lib/cmake/vtk-7.1" CACHE PATH "" FORCE)
# Trilinos not compiling with clang (check to wiki to fix)
LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
INCLUDE(disable-trilinos)
CMake/OSX.cmake → CMake/use-intel-compiler.cmake
+ 2
− 3
View file @ 8a20b0f1
......@@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Disable Trilinos (we should test with Trilinos/clang)
LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
INCLUDE(disable-trilinos)
SET(CMAKE_CXX_COMPILER "icpc" CACHE FILEPATH "" FORCE)
SET(CMAKE_C_COMPILER "icc" CACHE FILEPATH "" FORCE)
CMake/win64-libsVs2017Py3.cmake
+ 4
− 11
View file @ 8a20b0f1
......@@ -2,17 +2,10 @@
# with Luc Papeleux's precompiled libraries
SET(CMAKE_INSTALL_PREFIX "../waves_INSTALL" CACHE PATH "" FORCE)
STRING(REGEX REPLACE "\\\\" "/" MYLIBS $ENV{METAFORLIBS})
SET(CMAKE_GENERATOR "Visual Studio 15 2017 Win64" CACHE INTERNAL "" FORCE)
SET(PYTHON_INCLUDE_DIR "${MYLIBS}/Python/include" CACHE PATH "" FORCE)
SET(PYTHON_LIBRARY "${MYLIBS}/Python/Libs/python37.lib" CACHE FILEPATH "" FORCE)
SET(PYTHON_RELEASE_LIBRARY "${MYLIBS}/Python/Libs/python37.lib" CACHE FILEPATH "" FORCE)
SET(PYTHON_DEBUG_LIBRARY "${MYLIBS}/Python/Libs/python37_d.lib" CACHE FILEPATH "" FORCE)
# Disable Trilinos (we should test with Trilinos/clang)
LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
INCLUDE(disable-trilinos)
SET(PYTHON_INCLUDE_DIR "${MYLIBS}/Python/include" CACHE PATH "" FORCE)
SET(PYTHON_LIBRARY "${MYLIBS}/Python/Libs/python37.lib" CACHE FILEPATH "" FORCE)
SET(PYTHON_RELEASE_LIBRARY "${MYLIBS}/Python/Libs/python37.lib" CACHE FILEPATH "" FORCE)
SET(PYTHON_DEBUG_LIBRARY "${MYLIBS}/Python/Libs/python37_d.lib" CACHE FILEPATH "" FORCE)
CMakeLists.txt
+ 2
− 1
View file @ 8a20b0f1
......@@ -87,7 +87,7 @@ MESSAGE(STATUS "Python_FRAMEWORKS=${Python_FRAMEWORKS}")
# SWIG
FIND_PACKAGE(SWIG REQUIRED)
IF(CMAKE_GENERATOR MATCHES "Visual Studio") # not MSVC because of nmake & jom
SET(CMAKE_SWIG_OUTDIR "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/")
SET(CMAKE_SWIG_OUTDIR "${EXECUTABLE_OUTPUT_PATH}/$(Configuration)/")
ELSE()
SET(CMAKE_SWIG_OUTDIR "${EXECUTABLE_OUTPUT_PATH}")
ENDIF()
......@@ -123,6 +123,7 @@ ENABLE_TESTING()
# Default install location -> user's python site-packages
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -m site --user-site OUTPUT_VARIABLE PY_SITE OUTPUT_STRIP_TRAILING_WHITESPACE)
STRING(REGEX REPLACE "\\\\" "/" PY_SITE ${PY_SITE})
SET(CMAKE_INSTALL_PREFIX "${PY_SITE}/amfe" CACHE STRING "Install location" FORCE)
ENDIF()
# RPATH for Linux
......
fwk/_src/CMakeLists.txt
+ 2
− 1
View file @ 8a20b0f1
......@@ -42,5 +42,6 @@ SWIG_LINK_LIBRARIES(fwkw
fwk ${PYTHON_LIBRARIES}
)
INSTALL(FILES ${CMAKE_SWIG_OUTDIR}/fwkw.py DESTINATION ${CMAKE_INSTALL_PREFIX})
INSTALL(FILES "${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}/fwkw.py"
DESTINATION ${CMAKE_INSTALL_PREFIX})
INSTALL(TARGETS _fwkw DESTINATION ${CMAKE_INSTALL_PREFIX})
tbox/_src/CMakeLists.txt
+ 2
− 1
View file @ 8a20b0f1
......@@ -46,5 +46,6 @@ SWIG_LINK_LIBRARIES(tboxw
tbox fwk ${PYTHON_LIBRARIES}
)
INSTALL(FILES ${CMAKE_SWIG_OUTDIR}/tboxw.py DESTINATION ${CMAKE_INSTALL_PREFIX})
INSTALL(FILES "${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}/tboxw.py"
DESTINATION ${CMAKE_INSTALL_PREFIX})
INSTALL(TARGETS _tboxw DESTINATION ${CMAKE_INSTALL_PREFIX})
tbox/src/wLazy.h
+ 1
− 1
View file @ 8a20b0f1
......@@ -41,7 +41,7 @@ public:
Lazy(int _np) : value(), np(_np) {}
~Lazy()
{
delete value;
delete static_cast<T *>(value);
//std::cout << "lazy pointer deleted\n";
}
T &get()
......
tboxVtk/_src/CMakeLists.txt
+ 2
− 1
View file @ 8a20b0f1
......@@ -48,5 +48,6 @@ SWIG_LINK_LIBRARIES(tboxVtkw
tboxVtk tbox fwk ${PYTHON_LIBRARIES}
)
INSTALL(FILES ${CMAKE_SWIG_OUTDIR}/tboxVtkw.py DESTINATION ${CMAKE_INSTALL_PREFIX})
INSTALL(FILES "${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}/tboxVtkw.py"
DESTINATION ${CMAKE_INSTALL_PREFIX})
INSTALL(TARGETS _tboxVtkw DESTINATION ${CMAKE_INSTALL_PREFIX})
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment