-
Notifications
You must be signed in to change notification settings - Fork 36
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ACCORD-NWP CY50 contributions #172
Open
samhatfield
wants to merge
20
commits into
develop
Choose a base branch
from
ACCORD-NWP/to_CY50_rebased
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
e2e73a4
equivalent to ectrans in CY48T3_mrg48R1.02:contrib/
AlexandreMary 5ba37a2
Variable LALL_FFTW to perform fftw transforms in one bunch of all fi…
RyadElKhatibMF ae51a5c
phase with CY49R1
AlexandreMary 196070e
Added LAM transforms and LAM benchmark.
ddegrauwe cae92ee
cleaned installation a bit: only one library (trans) instead of separ…
ddegrauwe 98d0037
removed reference to etrans from trans/CMakeLists.txt
ddegrauwe 0ed874b
moved ellips to fiat
ddegrauwe ba837f4
add ectrans python interface ectrans4py
walidchikhi c12ef84
ectrans4py version is same as ectrans
AlexandreMary 5032eb9
cleaner python package
AlexandreMary ae6d7e0
Optional PROGRAMS feature
AlexandreMary 6a8de09
Label 1.2.50 = 1.2.0+@CY50
AlexandreMary 417bc1c
Merge branch 'to_CY50_fixed' into ACCORD-NWP/to_CY50_rebased
samhatfield f01ecf9
fixed ETRANS=ON: (i) follow single/double precision mechanism from tr…
ddegrauwe b39dc34
Added LAM test
ddegrauwe f821b09
added license information to etrans sources
ddegrauwe e297846
removed fft992 sources
ddegrauwe 048527f
removed PROGRAMS option (always true)
ddegrauwe 038023b
Merge branch 'develop' into ACCORD-NWP/to_CY50_rebased
samhatfield 73111ab
Touch up etrans tests
samhatfield File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
include AUTHORS | ||
include CMakeLists.txt | ||
include LICENSE | ||
include README.md | ||
include VERSION | ||
recursive-include src * | ||
recursive-include cmake * | ||
recursive-include tests * |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
[build-system] | ||
requires = ["setuptools", "wheel", "scikit-build"] | ||
build-backend = "setuptools.build_meta" | ||
|
||
[project] | ||
name = "ectrans4py" | ||
dynamic = ["version"] | ||
dependencies=["numpy", "ctypesForFortran<2.0.0"] | ||
|
||
[tool.setuptools.dynamic] | ||
version = {attr = "ectrans4py.__version__"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import os | ||
import ast | ||
from skbuild import setup | ||
|
||
_version_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), "VERSION") | ||
with open(_version_file, "r") as f: | ||
__version__ = f.read().strip() | ||
|
||
setup( | ||
name="ectrans4py", | ||
version=__version__, | ||
packages=['ectrans4py'], | ||
cmake_minimum_required_version="3.13", | ||
cmake_args=[ | ||
'-DENABLE_ETRANS=ON', | ||
'-DENABLE_ECTRANS4PY=ON', | ||
'-DENABLE_SINGLE_PRECISION=OFF', | ||
'-DENABLE_PROGRAMS=OFF', | ||
'-DENABLE_OMP=OFF', | ||
], | ||
package_dir={"": "src"}, | ||
cmake_install_dir="src/ectrans4py", | ||
setup_requires=["scikit-build", "setuptools"], | ||
install_requires=["numpy", "ctypesforfortran==1.1.3"], | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
if(HAVE_ETRANS) | ||
# (using CMAKE_CURRENT_SOURCE_DIR is necessary because sources are in a different directory than the target library (trans_${prec})) | ||
ecbuild_list_add_pattern( | ||
LIST ectrans4py_src | ||
GLOB ${CMAKE_CURRENT_SOURCE_DIR}/*.F90 | ||
QUIET | ||
) | ||
|
||
set(HAVE_dp ${HAVE_DOUBLE_PRECISION}) | ||
set(prec dp) | ||
|
||
if(HAVE_${prec}) | ||
# Add sources | ||
target_sources(trans_${prec} PRIVATE ${ectrans4py_src}) | ||
endif() | ||
|
||
else() | ||
ecbuild_critical("To activate the ectrans Python interface, you must enable the ETRANS option.") | ||
endif() | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this check is redundant because it's done in the CMakeLists.txt one level up.