Skip to content

Commit

Permalink
Merge pull request #381 from GEOS-ESM/bugfix/mathomp4/meson-f2py-v3
Browse files Browse the repository at this point in the history
Fixes for Python 3.12, meson, and f2py (v3 branch)
  • Loading branch information
mathomp4 authored Jun 14, 2024
2 parents 0f40e43 + f808513 commit 14d47db
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [3.45.3] - 2024-06-14

### Fixed

- Fix issue with use of `meson` and `f2py` with more complex codes
- NOTE: Requires a fix to `f2py` that is not yet released. You can see the change
in the `numpy` repo at https://github.com/numpy/numpy/pull/26659
This fix has been applied to GEOSpyD 2.44.0-0

## [3.45.2] - 2024-05-16

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions python/f2py3/UseF2Py3.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ macro (add_f2py3_module _name)
set(F2PY3_BACKEND "distutils")
endif ()

message(STATUS "Using F2PY3_BACKEND: ${F2PY3_BACKEND}")
#message(STATUS "Using F2PY3_BACKEND: ${F2PY3_BACKEND}")

if (F2PY3_BACKEND STREQUAL "distutils")
set(_fcompiler_opts "--fcompiler=${F2PY3_FCOMPILER}")
Expand Down Expand Up @@ -269,7 +269,7 @@ macro (add_f2py3_module _name)
COMMAND ${CMAKE_COMMAND} -E env "FC=${CMAKE_Fortran_COMPILER}"
${F2PY3_EXECUTABLE} ${F2PY_QUIET} -m ${_name}
--build-dir "${CMAKE_CURRENT_BINARY_DIR}/f2py3-${_name}"
${_fcompiler_opts} ${_inc_opts} -c ${_abs_srcs} ${REDIRECT_TO_DEV_NULL}
${_fcompiler_opts} ${_inc_opts} ${_lib_opts} -c ${_abs_srcs} ${REDIRECT_TO_DEV_NULL}
DEPENDS ${add_f2py3_module_SOURCES}
COMMENT "[F2PY3] Building Fortran to Python3 interface module ${_name}")
else ()
Expand Down

0 comments on commit 14d47db

Please sign in to comment.