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

Fix/remove logging #73

Merged
merged 3 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all 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 .github/workflows/mergeCi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: docker-compose --env-file .env.ci exec develop koina_lint.sh --fail-under=6

- name: Testing
run: docker-compose --env-file .env.ci exec develop koina_test.sh
run: docker-compose --env-file .env.ci exec develop koina_test.sh --check

- name: Shutdown
if: always()
Expand Down
2 changes: 1 addition & 1 deletion koina_format.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
cd /workspace/koina/
poetry run -C clients/python black . --check
poetry run -C clients/python black . $@
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = json.loads(args["model_config"])
Expand Down
1 change: 0 additions & 1 deletion models/AlphaPept/AlphaPept_ccs_generic/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = model_config = json.loads(args["model_config"])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = json.loads(args["model_config"])
Expand Down
1 change: 0 additions & 1 deletion models/AlphaPept/AlphaPept_ms2_generic/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = model_config = json.loads(args["model_config"])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = json.loads(args["model_config"])
Expand Down
1 change: 0 additions & 1 deletion models/AlphaPept/AlphaPept_rt_generic/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = model_config = json.loads(args["model_config"])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = json.loads(args["model_config"])
Expand Down
2 changes: 1 addition & 1 deletion models/Deeplc/Deeplc_Preprocess_onehot/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def initialize(self, args):
def execute(self, requests):
peptide_in_str = []
responses = []
logger = pb_utils.Logger

for request in requests:
peptide_in = pb_utils.get_input_tensor_by_name(request, "peptide_sequences")
peptides_ = peptide_in.as_numpy().tolist()
Expand Down
1 change: 0 additions & 1 deletion models/Generic/fragment_mz/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.frag_mz_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = model_config = json.loads(args["model_config"])
Expand Down
1 change: 0 additions & 1 deletion models/Prosit/Prosit_2019_intensity_postprocess/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = json.loads(args["model_config"])
Expand Down
1 change: 0 additions & 1 deletion models/Prosit/Prosit_2019_irt_postprocess/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = json.loads(args["model_config"])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = json.loads(args["model_config"])
Expand Down
2 changes: 1 addition & 1 deletion models/Prosit/Prosit_Preprocess_peptide/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def initialize(self, args):
def execute(self, requests):
peptide_in_str = []
responses = []
logger = pb_utils.Logger

for request in requests:
peptide_in = pb_utils.get_input_tensor_by_name(request, "peptide_sequences")
peptides_ = peptide_in.as_numpy().tolist()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ def split_modstring(sequence, r_pattern):

def character_to_array(character):
array = np.zeros((1, SEQ_LEN), dtype=np.uint8)
logger = pb_utils.Logger

generator_sequence_numeric = parse_modstrings(
[character], alphabet=ALPHABET, translate=True, filter=False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def initialize(self, args):
def execute(self, requests):
peptide_in_str = []
responses = []
logger = pb_utils.Logger

for request in requests:
peptide_in = pb_utils.get_input_tensor_by_name(request, "peptide_sequences")
peptides_ = peptide_in.as_numpy().tolist()
Expand Down
2 changes: 0 additions & 2 deletions models/Prosit/XL_Prosit_2023_intensity_postprocess/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = json.loads(args["model_config"])
output0_config = pb_utils.get_output_config_by_name(model_config, "intensities")
self.output_dtype = pb_utils.triton_string_to_numpy(output0_config["data_type"])

def execute(self, requests):
logger = pb_utils.Logger
responses = []
for request in requests:
peptide_in = (
Expand Down
1 change: 0 additions & 1 deletion models/Prosit/XL_Prosit_Helper_annotation/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ def initialize(self, args):
self.output_dtype = pb_utils.triton_string_to_numpy(output0_config["data_type"])

def execute(self, requests):
logger = pb_utils.Logger
responses = []
annotation = np.empty((0, 348))

Expand Down
5 changes: 0 additions & 5 deletions models/Prosit/XL_Prosit_Preprocess_peptide_CMS2/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ def initialize(self, args):
def execute(self, requests):
peptide_in_str = []
responses = []
logger = pb_utils.Logger
for request in requests:
peptide_in_1 = pb_utils.get_input_tensor_by_name(
request, "peptide_sequences_1"
Expand All @@ -47,17 +46,13 @@ def execute(self, requests):
peptides_2 = peptide_in_2.as_numpy().tolist()
peptide_in_1_list = [x[0].decode("utf-8") for x in peptides_1]
peptide_in_2_list = [x[0].decode("utf-8") for x in peptides_2]
logger.log_info(str(peptide_in_1_list))
logger.log_info(str(peptide_in_2_list))

sequences_1 = np.asarray(
[character_to_array(seq).flatten() for seq in peptide_in_1_list]
)
sequences_2 = np.asarray(
[character_to_array(seq).flatten() for seq in peptide_in_2_list]
)
logger.log_info(str(sequences_1))
logger.log_info(str(sequences_2))

t_1 = pb_utils.Tensor(
"peptides_in_1:0", sequences_1.astype(self.output_dtype)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ def split_modstring(sequence, r_pattern):

def character_to_array(character):
array = np.zeros((1, SEQ_LEN), dtype=np.uint8)
logger = pb_utils.Logger

logger.log_info(str(character))
generator_sequence_numeric = parse_modstrings(
[character], alphabet=ALPHABET, translate=True, filter=True
)
Expand Down
3 changes: 0 additions & 3 deletions models/Prosit/XL_Prosit_Preprocess_peptide_CMS3/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,14 @@ def initialize(self, args):
def execute(self, requests):
peptide_in_str = []
responses = []
logger = pb_utils.Logger
for request in requests:
peptide_in = pb_utils.get_input_tensor_by_name(request, "peptide_sequences")
peptides_ = peptide_in.as_numpy().tolist()
peptide_in_list = [x[0].decode("utf-8") for x in peptides_]
logger.log_info(str(peptide_in_list))

sequences = np.asarray(
[character_to_array(seq).flatten() for seq in peptide_in_list]
)
logger.log_info(str(sequences))

t = pb_utils.Tensor("peptides_in:0", sequences.astype(self.output_dtype))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ def split_modstring(sequence, r_pattern):

def character_to_array(character):
array = np.zeros((1, SEQ_LEN), dtype=np.uint8)
logger = pb_utils.Logger

logger.log_info(str(character))
generator_sequence_numeric = parse_modstrings(
[character], alphabet=ALPHABET, translate=True, filter=True
)
Expand Down
1 change: 0 additions & 1 deletion models/ms2pip/ms2pip_fragmentmz_wrapper/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ class TritonPythonModel:
def __init__(self):
super().__init__()
self.output_dtype = None
self.logger = pb_utils.Logger

def initialize(self, args):
model_config = json.loads(args["model_config"])
Expand Down
1 change: 0 additions & 1 deletion models/ms2pip/ms2pip_postprocess_single_model/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ def initialize(self, args):
self.output_dtype = pb_utils.triton_string_to_numpy(output0_config["data_type"])

def execute(self, requests):
logger = pb_utils.Logger
responses = []
for request in requests:
peptide_in = pb_utils.get_input_tensor_by_name(request, "raw_intensities")
Expand Down
1 change: 0 additions & 1 deletion models/ms2pip/ms2pip_preprocess/1/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ def initialize(self, args):
def execute(self, requests):
responses = []

logger = pb_utils.Logger
## every request is up to abatch_size
for request in requests:
peptide_in = pb_utils.get_input_tensor_by_name(request, "proforma")
Expand Down
7 changes: 4 additions & 3 deletions models/start.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@ def find_and_download():
"--allow-cpu-metrics=true",
"--allow-gpu-metrics=true",
"--metrics-port=8502",
"--log-info=true",
"--log-warning=true",
"--log-error=true",
"--log-info=false",
"--log-warning=false",
"--log-error=false",
"--log-verbose=0",
"--rate-limit",
"execution_count",
"--cuda-memory-pool-byte-size",
Expand Down
Loading