-
Notifications
You must be signed in to change notification settings - Fork 527
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
Conversation
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
Fx deepmodeling#3168. Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Codecov ReportAll modified and coverable lines are covered by tests ✅
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. |
wanghan-iapcm
approved these changes
Jan 24, 2024
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)
This was referenced Mar 3, 2024
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>
Closed
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
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.
Fix #3168.
See: pypa/setuptools-scm#1006 (comment)