Skip to content

physlr-make: update rules to reflect new features#141

Merged
jwcodee merged 11 commits intomasterfrom
make_hotfix
Jan 28, 2020
Merged

physlr-make: update rules to reflect new features#141
jwcodee merged 11 commits intomasterfrom
make_hotfix

Conversation

@jwcodee
Copy link
Copy Markdown
Contributor

@jwcodee jwcodee commented Jan 16, 2020

This PR contains updates that I missed when I updated the physlr-make file in the previous PRs #131 #140 . This PR also contains change to physlr-split-minimizers to work with ext.mol.tsv files.

@jwcodee jwcodee requested a review from lcoombe January 16, 2020 17:03
@lcoombe
Copy link
Copy Markdown
Contributor

lcoombe commented Jan 16, 2020

Can you rebase this on master??

@jwcodee
Copy link
Copy Markdown
Contributor Author

jwcodee commented Jan 16, 2020

Yeah I forgot to update this branch before pushing.

EDIT: done

Comment thread bin/physlr-make Outdated
Comment thread bin/physlr-make Outdated
Comment thread bin/physlr-make Outdated
@jwcodee jwcodee force-pushed the make_hotfix branch 2 times, most recently from a778497 to d9a3b9e Compare January 26, 2020 20:59
Comment thread bin/physlr-make Outdated
Comment thread bin/physlr-make Outdated
@aafshinfard
Copy link
Copy Markdown
Collaborator

@jowong4
At line 188, in help, the default value for mol_strategy is still distributed.

	@echo "	mol_strategy			molecule separation strategy [distributed]. Available options are bc, bc+k3, distributed, ext."

@aafshinfard
Copy link
Copy Markdown
Collaborator

aafshinfard commented Jan 27, 2020

there we have bug
when the user set mole_strategy to ext the makefile call the python code with --separation-strategy=ext which is not valid and previously I meant to use it to call the python code with distributed+sqcosbin in a single rule. so we can either remove ext from the help of physlr and make it a hidden keyword, or we can change the code so it translates ext to distributed+sqcosbin.

@jwcodee
Copy link
Copy Markdown
Contributor Author

jwcodee commented Jan 27, 2020

@afshinfard Are the new changes ok with you?

@aafshinfard
Copy link
Copy Markdown
Collaborator

@afshinfard Are the new changes ok with you?

Yes, prefect. Thanks.

@aafshinfard
Copy link
Copy Markdown
Collaborator

sorry, just found another refer to ext

@echo "	mol_strategy			molecule separation strategy [distributed+sqcosbin]. Available options are bc, bc+k3, distributed, ext."

@jwcodee jwcodee merged commit d07a1d6 into master Jan 28, 2020
@jwcodee jwcodee deleted the make_hotfix branch January 28, 2020 16:44
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.

3 participants