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

add Prob sampler #129

Merged
merged 14 commits into from
Oct 31, 2023
Merged

add Prob sampler #129

merged 14 commits into from
Oct 31, 2023

Conversation

CaRoLZhangxy
Copy link
Collaborator

No description provided.

Copy link
Collaborator

@wanghan-iapcm wanghan-iapcm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please provide UT

deepmd_pt/utils/dataloader.py Outdated Show resolved Hide resolved
@CaRoLZhangxy
Copy link
Collaborator Author

Until last commit, dp_pt can run with weighted sampler in dependently(also ut). Later commits will import deepmd-kit, which will rely on the version of deepmd-tensorflow

@wanghan-iapcm
Copy link
Collaborator

deepmodeling/deepmd-kit#2946 merged.
the ut of deepmd-pt should relies on the nightly build deepmd-tf

@CaRoLZhangxy
Copy link
Collaborator Author

deepmodeling/deepmd-kit#2946 merged. the ut of deepmd-pt should relies on the nightly build deepmd-tf

it seems nightly build version would not upload to pip, so version dependencies can not be easily assigned to requirements file. a released beta version may be needed.

@amcadmus
Copy link
Collaborator

deepmodeling/deepmd-kit#2946 merged. the ut of deepmd-pt should relies on the nightly build deepmd-tf

it seems nightly build version would not upload to pip, so version dependencies can not be easily assigned to requirements file. a released beta version may be needed.

plz check deepmodeling/deepmd-kit#2932

@CaRoLZhangxy
Copy link
Collaborator Author

it seems some ut depend on the depend version(previous version is 2.1.5 )。 @wanghan-iapcm

if prob_style == "prob_uniform":
prob_v = 1.0 / float(training_data.__len__())
probs = [prob_v for ii in range(training_data.__len__())]
elif prob_style == "prob_sys_size":
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this case merge with else ? It should be equivalent to "prob_sys_size;0:nsys:1.0"

@CaRoLZhangxy
Copy link
Collaborator Author

CaRoLZhangxy commented Oct 31, 2023

the case that be equivalent to "prob_sys_size;0:nsys:1.0" is actually "prob_sys_size".
also merge cases in tf version deepmodeling/deepmd-kit#2963

@wanghan-iapcm wanghan-iapcm merged commit 6c37765 into devel Oct 31, 2023
2 checks passed
@wanghan-iapcm wanghan-iapcm deleted the prob_sampler branch October 31, 2023 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants