From 1702369d9b84051552bdee74566f9e1937ab84ba Mon Sep 17 00:00:00 2001 From: yuzie007 Date: Tue, 11 Apr 2023 16:05:06 +0200 Subject: [PATCH 1/2] Reformat using black --- setup.py | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/setup.py b/setup.py index c6ad17e..c664374 100644 --- a/setup.py +++ b/setup.py @@ -4,25 +4,22 @@ setup( - name='tensorpotential', - #version=versioneer.get_version(), - version='0.2.0+19.gfa5b8b0', + name="tensorpotential", + # version=versioneer.get_version(), + version="0.2.0+19.gfa5b8b0", cmdclass=versioneer.get_cmdclass(), - packages=['tensorpotential', 'tensorpotential.utils', 'tensorpotential.potentials', 'tensorpotential.functions'], - package_dir={'': 'src'}, - url='', - license='', - author='Anton Bochkarev', - author_email='', - description='', - python_requires='<3.10', - install_requires= - [ - 'scipy', - 'tensorflow<=2.9.1', - 'numpy', - 'pandas', - 'ase' - ] + packages=[ + "tensorpotential", + "tensorpotential.utils", + "tensorpotential.potentials", + "tensorpotential.functions", + ], + package_dir={"": "src"}, + url="", + license="", + author="Anton Bochkarev", + author_email="", + description="", + python_requires="<3.10", + install_requires=["scipy", "tensorflow<=2.9.1", "numpy", "pandas", "ase"], ) - From d5b2bb40c6360fc839baf489ae81ac926b3ac879 Mon Sep 17 00:00:00 2001 From: yuzie007 Date: Tue, 11 Apr 2023 16:12:04 +0200 Subject: [PATCH 2/2] Modify to install tensorflow-macos for M1/M2 Mac --- setup.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c664374..8ed9b76 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,21 @@ +import platform + from setuptools import setup import versioneer +install_requires = [ + "scipy", + "numpy", + "pandas", + "ase", +] +if platform.system() == "Darwin" and platform.machine() == "arm64": + # M1/M2 Mac + install_requires.append("tensorflow-macos<=2.9.1") +else: + install_requires.append("tensorflow<=2.9.1") + setup( name="tensorpotential", @@ -21,5 +35,5 @@ author_email="", description="", python_requires="<3.10", - install_requires=["scipy", "tensorflow<=2.9.1", "numpy", "pandas", "ase"], + install_requires=install_requires, )