From 973730c2056af0207a7ea99d985bd7c42dca907f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 30 Jul 2019 20:42:13 +0800 Subject: [PATCH 1/3] use setuptools_scm --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index fb7cbf986b..27e7dc1f44 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ # install_requires = ['xml'] install_requires=['numpy', 'scipy'] -setup_requires=['setuptools-git-version'] +setup_requires=['setuptools_scm'] # add cmake as a build requirement if cmake>3.0 is not installed try: @@ -38,7 +38,7 @@ setup( name="deepmd-kit", setup_requires=setup_requires, - version_format='{tag}.dev{commitcount}_{gitsha}', + use_scm_version={'write_to': 'source/train/_version.py'}, author="Han Wang", author_email="wang_han@iapcm.ac.cn", description="A deep learning package for many-body potential energy representation and molecular dynamics", From 4b82cfbbb8f4665cd02f54b8367433a02ce09407 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 30 Jul 2019 20:41:54 +0800 Subject: [PATCH 2/3] pin gcc to v4.8 in CI --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1753b15463..cabd8f07fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,12 @@ language: python python: "3.6" +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.8 + - g++-4.8 env: matrix: - TENSORFLOW_VERSION=1.8 From b5b43147a6af57c23dc6b236deae8658f7876534 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 30 Jul 2019 20:49:24 +0800 Subject: [PATCH 3/3] specify CC and CXX in CI --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index cabd8f07fc..02b91909d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,9 @@ addons: - gcc-4.8 - g++-4.8 env: + global: + - CC=gcc-4.8 + - CXX=g++-4.8 matrix: - TENSORFLOW_VERSION=1.8 - TENSORFLOW_VERSION=1.12