Skip to content

Commit

Permalink
Revert "Merge pull request #18 from ai2cm/pypi"
Browse files Browse the repository at this point in the history
This reverts commit 4b54d65, reversing
changes made to 6d56caa.
  • Loading branch information
frodre committed Oct 8, 2024
1 parent 4b54d65 commit 83b32bc
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 278 deletions.
14 changes: 0 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
VERSION ?= $(shell git rev-parse --short HEAD)
IMAGE ?= fme
ENVIRONMENT_NAME ?= fme
DEPLOY_TARGET ?= pypi

build_docker_image:
docker build -f docker/Dockerfile -t $(IMAGE):$(VERSION) .
Expand All @@ -17,16 +16,3 @@ create_environment:

test:
pytest --durations 20 .

# For maintainer use only
# requires fme[deploy] to be installed

build_pypi:
rm -rf fme/dist
cd fme && python -m build

deploy_pypi: build_pypi
cd fme && twine upload --repository $(DEPLOY_TARGET) dist/*

deploy_test_pypi: DEPLOY_TARGET = testpypi
deploy_test_pypi: deploy_pypi
201 changes: 0 additions & 201 deletions fme/LICENSE

This file was deleted.

26 changes: 2 additions & 24 deletions fme/README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,2 @@
[![Docs](https://readthedocs.org/projects/ai2-climate-emulator/badge/?version=latest)](https://ai2-climate-emulator.readthedocs.io/en/latest/)

# FME: Weather/Climate Model Emulation
This package contains code to train and evaluate weather/climate model emulators as seen in
"ACE: A fast, skillful learned global atmospheric model for climate prediction" ([arxiv:2310.02074](https://arxiv.org/abs/2310.02074))
and "Application of the Ai2 Climate Emulator to E3SMv2's global atmosphere model, with a focus on precipitation fidelity"
([JGR-ML](https://agupubs.onlinelibrary.wiley.com/doi/full/10.1029/2024JH000136)).


## Installation

The package can be installed via PyPI using:

```
pip install fme
```

## Quickstart

A quickstart guide may be found [here](https://ai2-climate-emulator.readthedocs.io/en/latest/quickstart.html).

## Documentation

See complete documentation [here](https://ai2-climate-emulator.readthedocs.io/en/latest/).
This python package is intended for use in the training and evaluation of
machine learning models that emulate weather and climate data.
2 changes: 0 additions & 2 deletions fme/deploy-requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion fme/fme/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2024.9.0"
__version__ = "0.2.0"

import torch_harmonics

Expand Down
1 change: 1 addition & 0 deletions fme/fme/core/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "0.2.0"
5 changes: 5 additions & 0 deletions fme/fme/test_version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import fme


def test_version():
assert fme.__version__ == "0.2.0"
35 changes: 0 additions & 35 deletions fme/pyproject.toml

This file was deleted.

2 changes: 1 addition & 1 deletion fme/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ tensorly-torch
xarray
dacite
torch
torch-harmonics==0.6.2
torch-harmonics@git+https://github.com/NVIDIA/torch-harmonics.git@8826246cacf6c37b600cdd63fde210815ba238fd
zarr
gcsfs
s3fs
Expand Down
42 changes: 42 additions & 0 deletions fme/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
from setuptools import find_packages, setup


def read_requirements(filename: str):
with open(filename) as requirements_file:
requirements = []
for line in requirements_file:
line = line.strip()
if line.startswith("#") or len(line) == 0:
continue
requirements.append(line)
return requirements


setup(
name="fme",
version="0.2.0",
description="",
long_description=open("README.md").read(),
long_description_content_type="text/markdown",
classifiers=[
"Intended Audience :: Science/Research",
"Development Status :: 3 - Alpha",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3",
"Topic :: Scientific/Engineering :: Artificial Intelligence",
],
keywords="",
url="https://github.com/ai2cm/ace",
author="Allen Institute for Artificial Intelligence",
author_email="[email protected]",
license="Apache",
packages=find_packages(
exclude=["*.tests", "*.tests.*", "tests.*", "tests"],
),
install_requires=read_requirements("requirements.txt"),
extras_require={
"dev": read_requirements("dev-requirements.txt"),
"docs": read_requirements("docs/requirements.txt"),
},
python_requires=">=3.8",
)

0 comments on commit 83b32bc

Please sign in to comment.