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

Stabilize CICD #140

Closed
wants to merge 22 commits into from
Closed
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pipeline {
steps {
sh '''
rm -rf test-reports/TEST-*.xml
jbsub -wait -out ccc_log.txt -queue x86_1h -mem 40g -cores "10+1" -require 'v100' ./run_all_unit_tests.sh 11.8 /dccstor/fuse_med_ml/fuse-drug/cicd/envs/
jbsub -wait -out ccc_log.txt -queue x86_1h -mem 40g -cores "10+1" -require 'v100' ./run_all_unit_tests.sh no /dccstor/fuse_med_ml/fuse-drug/cicd/envs/
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I don't see why we need to enforce it and use conda installation.

echo "------ printing ccc_log.txt -----"
cat "./ccc_log.txt"
echo "------ Done printing ccc_log.txt ------"
Expand Down
6 changes: 1 addition & 5 deletions fusedrug/data/tokenizer/ops/pytoda_tokenizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,13 @@
LeftPadding,
ToTensor,
)
import torch


class Op_pytoda_SMILESTokenizer(OpBase):
def __init__(self, SMILES_Tokenizer_kwargs: dict, **kwargs: dict):
super().__init__(**kwargs)
self.language = SMILESTokenizer(
**SMILES_Tokenizer_kwargs,
device=torch.device(
"cpu"
), # this is critical for DataLoader multiprocessing to work well !!!
)

def __call__(
Expand Down Expand Up @@ -66,7 +62,7 @@ def __init__(

if isinstance(self.protein_language, ProteinLanguage):
# transforms += [ToTensor(device=self.device)]
transforms += [ToTensor(torch.device("cpu"))]
transforms += [ToTensor()]
else:
# note: ProteinFeatureLanguage supported wasn't transferred here.
raise TypeError(
Expand Down
3 changes: 1 addition & 2 deletions fusedrug_examples/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
tensorflow
dscript
dgl
pysmiles
deepchem
mol2vec @ git+https://github.com/samoturk/mol2vec
paccmann_predictor @ git+https://[email protected]/PaccMann/paccmann_predictor#egg=paccmann-predictor
modlamp
torchtext==0.3.1 # old version of tokenizer - need to replace with another tokenizer and remove this
biopython
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The last version is 0.18 (!) , plus they stopped the development of it.

torchtext
x_transformers
4 changes: 2 additions & 2 deletions run_all_unit_tests.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
source ~/.bashrc

export CUDA_HOME=/opt/share/cuda-11.8 #to prevent mismatch between cuda runtime and the cuda version used to compile pytorch
export CUDA_HOME=/opt/share/cuda-12.1 #to prevent mismatch between cuda runtime and the cuda version used to compile pytorch

# check if current env already exist
find_in_conda_env(){
Expand Down Expand Up @@ -30,7 +30,7 @@ create_env() {
fi

# Python version
PYTHON_VER=3.8
PYTHON_VER=3.11
ENV_NAME="fuse-drug_$PYTHON_VER-CUDA-$force_cuda_version-$(echo -n $requirements | sha256sum | awk '{print $1;}')"
echo $ENV_NAME

Expand Down
Loading