Skip to content
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

detect version in advance before building deepmd-kit-cu11 #3172

Merged
merged 3 commits into from
Jan 24, 2024

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Jan 24, 2024

njzjz added 3 commits January 23, 2024 18:24
Fx deepmodeling#3168.

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
@njzjz njzjz added the build label Jan 24, 2024
@njzjz njzjz linked an issue Jan 24, 2024 that may be closed by this pull request
Copy link

codecov bot commented Jan 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (585414a) 76.06% compared to head (66c865f) 76.06%.

Additional details and impacted files
@@           Coverage Diff           @@
##            devel    #3172   +/-   ##
=======================================
  Coverage   76.06%   76.06%           
=======================================
  Files         277      277           
  Lines       25603    25603           
  Branches     1591     1591           
=======================================
  Hits        19476    19476           
  Misses       5203     5203           
  Partials      924      924           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@wanghan-iapcm wanghan-iapcm merged commit 5dfbb55 into deepmodeling:devel Jan 24, 2024
48 checks passed
iProzd added a commit to iProzd/deepmd-kit that referenced this pull request Jan 24, 2024
* Fix max nbor size related issues (deepmodeling#3157)

* Merge master into devel (deepmodeling#3167)

* [pre-commit.ci] pre-commit autoupdate (deepmodeling#3163)

<!--pre-commit.ci start-->
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.13 →
v0.1.14](astral-sh/ruff-pre-commit@v0.1.13...v0.1.14)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* setup PyTorch C++ interface build environement (deepmodeling#3169)

See deepmodeling#3120.

- CMake: add `ENABLE_TENSORFLOW` and `ENABLE_PYTORCH`.
`BUILD_TENSORFLOW` will be enabled when `TENSORFLOW_ROOT` is not empty
or `USE_TF_PYTHON_LIBS` is on.
- api_cc: add `BUILD_TENSORFLOW` and `BUILD_PYTORCH` defination. Move
several functions from `common.h` to `commonTF.h` to prevent exposing
them to header files.
- CI: download libtorch in the build/test CC actions.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

* docs: add TF icons to platform-specific features (deepmodeling#3171)

Fix deepmodeling#3121.

The PyTorch icon can be added when a feature implemented by PyTorch is
added.

However, I can't find a way to add an icon to TOC.


![image](https://github.com/deepmodeling/deepmd-kit/assets/9496702/7f29da27-af81-4850-9da0-79310d216b2d)

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

* add universal Python inference interface DeepPot (deepmodeling#3164)

Need discussion for other classes.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

* detect version in advance before building deepmd-kit-cu11 (deepmodeling#3172)

Fix deepmodeling#3168.

See:
pypa/setuptools-scm#1006 (comment)

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: Denghui Lu <denghuilu@pku.edu.cn>
Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
njzjz added a commit to njzjz/deepmd-kit that referenced this pull request Feb 4, 2024
…ng#3172)

Fix deepmodeling#3168.

See:
pypa/setuptools-scm#1006 (comment)

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
(cherry picked from commit 5dfbb55)
wanghan-iapcm pushed a commit that referenced this pull request Feb 5, 2024
Fix #3168.

See:
pypa/setuptools-scm#1006 (comment)

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
(cherry picked from commit 5dfbb55)
github-merge-queue bot pushed a commit that referenced this pull request Mar 4, 2024
Fix #3168.

#3172 didn't fix #3168. The environmental variable
`SETUPTOOLS_SCM_PRETEND_VERSION` works. I don't know what's wrong with
the previous one.
In this PR, I deleted the `.git` directory for `deepmd-kit-cu11`, which
will throw an error if it doesn't work.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
@njzjz njzjz mentioned this pull request Apr 2, 2024
njzjz added a commit to njzjz/deepmd-kit that referenced this pull request Apr 6, 2024
Fix deepmodeling#3168.

deepmodeling#3172 didn't fix deepmodeling#3168. The environmental variable
`SETUPTOOLS_SCM_PRETEND_VERSION` works. I don't know what's wrong with
the previous one.
In this PR, I deleted the `.git` directory for `deepmd-kit-cu11`, which
will throw an error if it doesn't work.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
(cherry picked from commit bd79dec)
njzjz added a commit that referenced this pull request Apr 6, 2024
Fix #3168.

#3172 didn't fix #3168. The environmental variable
`SETUPTOOLS_SCM_PRETEND_VERSION` works. I don't know what's wrong with
the previous one.
In this PR, I deleted the `.git` directory for `deepmd-kit-cu11`, which
will throw an error if it doesn't work.

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
(cherry picked from commit bd79dec)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

failed to upload deepmd-kit-cu11
2 participants