Skip to content

Commit 068c349

Browse files
jpbarrettjpbarrett
committed
Merge branch 'master'
2 parents c820e8e + 8b108b0 commit 068c349

86 files changed

Lines changed: 141 additions & 380 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
################################################################################
22
#CMAKE version and policies
3-
cmake_minimum_required(VERSION 3.1)
3+
cmake_minimum_required(VERSION 3.8)
44

55
if(${CMAKE_VERSION} VERSION_GREATER "3.11.0")
66
cmake_policy(SET CMP0074 OLD)
@@ -139,7 +139,7 @@ option(HOPS_ENABLE_TEST "Build developer tests." ON)
139139
option(HOPS_USE_FFTW3 "Use FFTW3 for fast fourier transforms (optional, but highly recommended)" ON)
140140
option(HOPS_USE_DIFXIO "Link against difxio library to read DiFX files" OFF)
141141
option(HOPS_USE_PYBIND11 "Build python bindings with pybind11" ON)
142-
option(HOPS_USE_MATPLOTPP "Build copy of matplot++ (requires gnuplot) for fast plotting" ON)
142+
option(HOPS_USE_MATPLOTPP "Build copy of matplot++ (requires gnuplot & C++17) for fast plotting" ON)
143143
option(HOPS_USE_MPI "Use MPI (Message Passing Interface) for parallel processing" OFF)
144144
option(HOPS3_PYTHON_EXTRAS "Build python (ctypes) interface to hops3 libraries" ON)
145145
option(HOPS_IS_HOPS4 "Install the HOPS4 version of relevant executables (symlinked to expected names, e.g. fourfit, fplot)" OFF)
@@ -182,16 +182,23 @@ if(HOPS_USE_CUDA)
182182
hops_add_cxxflag(HOPS_USE_CUDA)
183183
endif(HOPS_USE_CUDA)
184184

185+
include(CheckCXXCompilerFlag)
185186
if(HOPS_USE_MATPLOTPP)
186-
find_package(Gnuplot)
187-
if(Gnuplot_FOUND)
188-
hops_add_cxxflag(USE_MATPLOTPP)
187+
# Check if compiler supports C++17 (requires cmake > 3.8)
188+
check_cxx_compiler_flag("-std=c++17" COMPILER_SUPPORTS_CXX17)
189+
if(NOT COMPILER_SUPPORTS_CXX17)
190+
message(WARNING "C++17 is not supported by this compiler, disabling HOPS_USE_MATPLOTPP")
191+
set(HOPS_USE_MATPLOTPP OFF CACHE BOOL "Build copy of matplot++ (requires gnuplot & C++17)" FORCE)
189192
else()
190-
message(STATUS "Use of matplot++ was requested but gnuplot was not found, disabling HOPS_USE_MATPLOTPP")
191-
set(HOPS_USE_MATPLOTPP OFF CACHE BOOL "Build copy of matplot++ (requires gnuplot) for fast plotting" FORCE)
192-
endif(Gnuplot_FOUND)
193-
endif(HOPS_USE_MATPLOTPP)
194-
193+
find_package(Gnuplot)
194+
if(Gnuplot_FOUND)
195+
hops_add_cxxflag(USE_MATPLOTPP)
196+
else()
197+
message(WARNING "Use of matplot++ was requested but gnuplot was not found, disabling HOPS_USE_MATPLOTPP")
198+
set(HOPS_USE_MATPLOTPP OFF CACHE BOOL "Build copy of matplot++ (requires gnuplot & C++17)" FORCE)
199+
endif()
200+
endif()
201+
endif()
195202

196203
#explicity set the command to for vpal library fringe fitter via env var
197204
if(HOPS_IS_HOPS4)

‎source/python_src/CMakeLists.txt‎

Lines changed: 35 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,53 @@
11
if(PY_EXE)
22

3-
#just wholesale copy the entire python source directory into the build directory
4-
#because the pythonic wizards who wrote setuptools like to pollute the source
5-
#directory with egg.info garbage
6-
if( NOT ("${CMAKE_CURRENT_SOURCE_DIR}/" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}/" ) )
7-
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
8-
endif()
9-
10-
set(abs_srcdir "${CMAKE_CURRENT_BINARY_DIR}")
11-
12-
# add_custom_target( hops4py_copy_src ALL
13-
# COMMAND ${CMAKE_COMMAND} -E copy_directory
14-
# "${CMAKE_CURRENT_SOURCE_DIR}/" "${CMAKE_CURRENT_BINARY_DIR}/"
15-
# )
16-
17-
#need this target to refresh our copy if anything in the source has changed
18-
if( NOT ("${CMAKE_CURRENT_SOURCE_DIR}/" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}/" ) )
19-
add_custom_target( hops4py_copy_src ALL
20-
COMMAND cp -r "${CMAKE_CURRENT_SOURCE_DIR}/" "${CMAKE_CURRENT_BINARY_DIR}/"
21-
)
22-
else()
23-
add_custom_target( hops4py_copy_src)
24-
endif()
25-
26-
#setup-no-deps.py.in assumes that the system already has the python dependencies
27-
#needed (numpy, matplotlib, future, scipy) and makes not attempt to manage or
28-
#install them, this is also useful for off-line installations
29-
set(SETUP_PY_IN "${CMAKE_CURRENT_BINARY_DIR}/setup-no-deps.py.in")
303
if(HOPS_PYPI_MANAGE_DEPS)
31-
#if the user chooses, we can as pip to pull and install the python dependencies
32-
#for us at time of installation (but don't do this automatically)
33-
set(SETUP_PY_IN "${CMAKE_CURRENT_BINARY_DIR}/setup-deps.py.in")
34-
endif(HOPS_PYPI_MANAGE_DEPS)
35-
36-
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
37-
configure_file(${SETUP_PY_IN} ${SETUP_PY})
38-
39-
#add a build target to catch problems before install (output not used)
40-
if(HOPS3_PYTHON_EXTRAS)
41-
add_custom_target(hops4py_build_target ALL
42-
COMMAND ${PY_EXE} ${SETUP_PY} build
43-
DEPENDS hops4py_copy_src
44-
)
45-
endif(HOPS3_PYTHON_EXTRAS)
4+
5+
#if the user chooses to enable HOPS_PYPI_MANAGE_DEPS, then we can use pip to pull/install the python dependencies
6+
#for us at time of installation, but we don't do this automatically
7+
set(REQUIREMENTS_TXT_IN "${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt")
8+
set(REQUIREMENTS_TXT "${CMAKE_CURRENT_BINARY_DIR}/requirements.txt")
9+
configure_file(${REQUIREMENTS_TXT_IN} ${REQUIREMENTS_TXT})
10+
install(CODE "execute_process(COMMAND ${PY_EXE} -m pip install --upgrade --target=${PYTHON_MODULE_INSTALL_DIR} -r ${REQUIREMENTS_TXT} )")
11+
12+
else(HOPS_PYPI_MANAGE_DEPS)
13+
14+
#look for our minimal set of python dependencies and warn user if they are not found
15+
set(PYTHON_PACKAGES "numpy" "scipy" "matplotlib")
16+
17+
foreach(pkg IN LISTS PYTHON_PACKAGES)
18+
execute_process(
19+
COMMAND ${PY_EXE} -c "import ${pkg}"
20+
RESULT_VARIABLE _status
21+
OUTPUT_QUIET
22+
ERROR_QUIET
23+
)
24+
if(NOT _status EQUAL 0)
25+
message(WARNING "Python package '${pkg}' not found. You may need to install it, or toggle HOPS_PYPI_MANAGE_DEPS to ON ")
26+
set(MISSING_PYTHON_PACKAGES TRUE)
27+
endif()
28+
endforeach()
29+
30+
#tell user how to install the missing dependencies
31+
if(MISSING_PYTHON_PACKAGES)
32+
message(STATUS "Not all python dependencies were found, some python extension functionality may be missing.")
33+
message(STATUS "You can install the missing packages automatically by enabling HOPS_PYPI_MANAGE_DEPS or manually with:")
34+
message(STATUS " pip install -r ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt")
35+
endif()
4636

47-
if("${PYTHON_SETUP}" STREQUAL "setuptools")
48-
#use pip/setuptools
49-
install(CODE "execute_process(COMMAND ${PY_EXE} -m pip install ${CMAKE_CURRENT_BINARY_DIR} --upgrade --target=${PYTHON_MODULE_INSTALL_DIR} )")
50-
else()
51-
#use distutils
52-
install(CODE "execute_process( COMMAND ${PY_EXE} ${SETUP_PY} install --prefix=${CMAKE_INSTALL_PREFIX} )")
53-
endif()
37+
endif(HOPS_PYPI_MANAGE_DEPS)
5438

5539
if(HOPS3_PYTHON_EXTRAS AND NOT HOPS3_USE_CXX)
5640
add_subdirectory(mk4_module)
5741
add_subdirectory(vpal_module)
5842
add_subdirectory(ffcontrol_module)
59-
endif(HOPS3_PYTHON_EXTRAS AND NOT HOPS3_USE_CXX)
43+
endif()
6044

6145
if(HOPS_ENABLE_TEST)
6246
enable_testing()
6347
add_subdirectory(test)
6448
endif(HOPS_ENABLE_TEST)
6549

50+
add_subdirectory(hops_module)
6651
add_subdirectory(scripts)
6752
add_subdirectory(plugins)
6853

‎source/python_src/ffcontrol_module/CMakeLists.txt‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,31 +57,11 @@ hops_install_libraries (${LIBNAME})
5757
#python package setup ##########################################################
5858
if (PY_EXE)
5959

60-
set(abs_srcdir "${CMAKE_CURRENT_BINARY_DIR}")
61-
62-
#need this target to refresh our copy if anything in the source has changed
63-
add_custom_target( ffcontrol_copy_src ALL
64-
COMMAND ${CMAKE_COMMAND} -E copy_directory
65-
"${CMAKE_CURRENT_SOURCE_DIR}/" "${CMAKE_CURRENT_BINARY_DIR}/"
66-
)
67-
68-
set(SETUP_PY_IN "${CMAKE_CURRENT_BINARY_DIR}/setup.py.in")
69-
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
70-
71-
configure_file(${SETUP_PY_IN} ${SETUP_PY})
72-
73-
#add a build target to catch problems before install (output not used)
74-
add_custom_target(ffcontrol_build_target ALL
75-
COMMAND ${PY_EXE} ${SETUP_PY} build
76-
DEPENDS hops4py_copy_src ffcontrol_copy_src
77-
)
78-
79-
if("${PYTHON_SETUP}" STREQUAL "setuptools")
80-
#use pip/setuptools
81-
install(CODE "execute_process(COMMAND ${PY_EXE} -m pip install ${CMAKE_CURRENT_BINARY_DIR} --upgrade --target=${PYTHON_MODULE_INSTALL_DIR} )")
82-
else()
83-
#use distutils
84-
install(CODE "execute_process( COMMAND ${PY_EXE} ${SETUP_PY} install --prefix=${CMAKE_INSTALL_PREFIX} )")
85-
endif()
60+
# Install Python module files directly using CMake
61+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ffcontrol"
62+
DESTINATION "${PYTHON_MODULE_INSTALL_DIR}"
63+
FILES_MATCHING
64+
PATTERN "*.py"
65+
PATTERN "__pycache__" EXCLUDE)
8666

8767
endif(PY_EXE)

‎source/python_src/ffcontrol_module/ffcontrol/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from .__version__ import __version__
2+
13
from .ffcontrol import FFControlStructureBase
24
from .ffcontrol import gat_struct
35
from .ffcontrol import istats

‎source/python_src/ffcontrol_module/ffcontrol/__version__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = "0.1.0"

‎source/python_src/ffcontrol_module/ffcontrol/ffcontrol.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
"""module accessing fourfit control file data via c-library """
22

33
#core imports
4-
from __future__ import print_function
5-
from builtins import chr
6-
from builtins import range
74
import ctypes
85
import os
96
import shutil

‎source/python_src/ffcontrol_module/setup.py.in‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎source/python_src/hops/__init__.py‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎source/python_src/hops_module/CMakeLists.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#python package setup ##########################################################
2+
if (PY_EXE)
3+
4+
# Install Python module packages directly using CMake
5+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/hops"
6+
DESTINATION "${PYTHON_MODULE_INSTALL_DIR}"
7+
FILES_MATCHING
8+
PATTERN "*.py"
9+
PATTERN "__pycache__" EXCLUDE)
10+
11+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/hops_io"
12+
DESTINATION "${PYTHON_MODULE_INSTALL_DIR}"
13+
FILES_MATCHING
14+
PATTERN "*.py"
15+
PATTERN "__pycache__" EXCLUDE)
16+
17+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/hops_visualization"
18+
DESTINATION "${PYTHON_MODULE_INSTALL_DIR}"
19+
FILES_MATCHING
20+
PATTERN "*.py"
21+
PATTERN "__pycache__" EXCLUDE)
22+
23+
endif(PY_EXE)

‎source/python_src/hops_module/hops/__init__.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from .__version__ import __version__
2+
3+
from pyMHO_Containers import *

0 commit comments

Comments
 (0)