Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Put back some of the missing SHTOOLS stuff that got messed up in the …
Browse files Browse the repository at this point in the history
…merge
  • Loading branch information
daminton committed Jan 18, 2024
1 parent 969f72c commit c170a72
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 21 deletions.
8 changes: 3 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,14 @@ ELSE()

IF (CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
SET(COMPILER_OPTIONS "Intel" CACHE STRING "Compiler identified as Intel")
FIND_PACKAGE(MKL)
ELSEIF (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
SET(COMPILER_OPTIONS "GNU" CACHE STRING "Compiler identified as gfortran")
ELSE ()
MESSAGE(FATAL_ERROR "Compiler ${CMAKE_Fortran_COMPILER_ID} not recognized!")
ENDIF ()
FIND_PACKAGE(SHTOOLS REQUIRED)
FIND_PACKAGE(FFTW3 REQUIRED)

# The following section is modified from Numpy f2py documentation
IF(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
Expand Down Expand Up @@ -113,13 +116,8 @@ ELSE()
ENDIF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
INCLUDE(SetParallelizationLibrary)

IF (COMPILER_OPTIONS STREQUAL "Intel" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
INCLUDE(SetMKL)
ENDIF ()
INCLUDE(SetSwiftestFlags)



# The source for the SWIFTEST binary and have it placed in the bin folder
ADD_SUBDIRECTORY(${SRC} ${CMAKE_INSTALL_BINDIR})
ADD_SUBDIRECTORY(${PY})
Expand Down
14 changes: 0 additions & 14 deletions cmake/Modules/SetMKL.cmake

This file was deleted.

5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ dependencies = [
'astropy>=5.2',
'astroquery>=0.4.6',
'tqdm>=4.64.1',
'cython>=3.0.0'
'cython>=3.0.0',
'pyshtools>=4.10'
]

[project.urls]
Expand Down Expand Up @@ -136,7 +137,7 @@ CMAKE_INSTALL_LIBDIR="lib"
[tool.cibuildwheel.linux]
skip = "cp312-* pp* -manylinux_i686* *-musllinux*"
before-all = [
"yum install doxygen libxml2-devel libcurl-devel -y",
"yum install doxygen libxml2-devel libcurl-devel fftw-devel blas-devel lapack-devel -y",
"buildscripts/build_dependencies.sh -p /usr/local"
]

Expand Down

0 comments on commit c170a72

Please sign in to comment.