From eb2db8b0b6f15e708b6bd2a16c1d348ad2a2b9b9 Mon Sep 17 00:00:00 2001 From: Terry Kong Date: Wed, 20 Nov 2024 12:27:14 -0800 Subject: [PATCH 01/18] feat: TRTLLM API handle tokenizers without pad_id (e.g., tiktoken) (#399) Signed-off-by: Terry Kong Signed-off-by: NeMo-Aligner CI Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- nemo_aligner/utils/trt_llm.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/nemo_aligner/utils/trt_llm.py b/nemo_aligner/utils/trt_llm.py index 1f879064d..9f1a9345f 100644 --- a/nemo_aligner/utils/trt_llm.py +++ b/nemo_aligner/utils/trt_llm.py @@ -44,8 +44,9 @@ def append_and_repad_list(list_of_items, item_to_append, pad_id): class GPTGenerateTRTLLM: - # If a tokenizer does not have a pad_id, we use a large negative number and replace - # with self.eos_id after generation. + # Use a reserved negative number since there is variation between tokenizers if + # they (1) have a pad_id (2) don't have a pad_id or (3) have None as the pad_id. + # This pad_id is replaced with eos_id after generation. DEFAULT_PAD_ID = -42 def __init__( @@ -72,12 +73,6 @@ def __init__( "You are trying to use NeMo-Aligner's TensorRT-LLM acceleration for LLM generation. Please build the dockerfile to enable this feature: https://github.com/NVIDIA/NeMo-Aligner/blob/main/Dockerfile" ) - # If this assert turns out to be a blocker with some tokenizers, potential workarounds could be to: - # - add a config option to allow specifying which token we pass as `end_id` to TRT-LLM (should - # be a token that the model is guaranteed to never generate) - assert ( - tokenizer.pad_id != tokenizer.eos_id - ), f"We require tokenizers to have a different {tokenizer.pad_id=} than {tokenizer.eos_id=} when using TRT-LLM. This is to make sure all code goes into the same path and include the eos_id when the response lengths are computed" assert max_input_len > 0 assert max_generation_length > 0 assert ( @@ -104,7 +99,7 @@ def __init__( rng_generator.manual_seed(seed) self.rng_generator = rng_generator - self.pad_id = tokenizer.pad_id if tokenizer.pad_id is not None else GPTGenerateTRTLLM.DEFAULT_PAD_ID + self.pad_id = GPTGenerateTRTLLM.DEFAULT_PAD_ID self.eos_id = tokenizer.eos_id end_strings = list(end_strings) From e459768b9a150a772be92864162a9c486fd0498a Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 11:33:05 +0100 Subject: [PATCH 02/18] build: Push requirements Signed-off-by: Oliver Koenig --- Dockerfile | 44 ++++++++++++++++-------------------------- setup.py | 22 ++++++++++++++++++--- setup/requirements.txt | 6 +++--- 3 files changed, 39 insertions(+), 33 deletions(-) diff --git a/Dockerfile b/Dockerfile index 44a9f8651..86ee188d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ARG MAX_JOBS=8 ARG TE_TAG=7d576ed25266a17a7b651f2c12e8498f67e0baea ARG PYTRITON_VERSION=0.5.10 ARG NEMO_TAG=19668e5320a2e2af0199b6d5e0b841993be3a634 # On: main -ARG MLM_TAG=25059d3bbf68be0751800f3644731df12a88f3f3 # On: main +ARG MCORE_TAG=25059d3bbf68be0751800f3644731df12a88f3f3 # On: main ARG ALIGNER_COMMIT=main ARG TRTLLM_VERSION=v0.13.0 ARG PROTOBUF_VERSION=4.24.4 @@ -49,8 +49,8 @@ RUN pip uninstall -y apex && \ git clone https://github.com/NVIDIA/apex && \ cd apex && \ if [ ! -z $APEX_TAG ]; then \ - git fetch origin $APEX_TAG && \ - git checkout FETCH_HEAD; \ + git fetch origin $APEX_TAG && \ + git checkout FETCH_HEAD; \ fi && \ pip install -v --no-build-isolation --disable-pip-version-check --no-cache-dir --config-settings "--build-option=--cpp_ext --cuda_ext --fast_layer_norm --distributed_adam --deprecated_fused_adam" ./ @@ -77,18 +77,10 @@ RUN pip uninstall -y transformer-engine && \ git clone https://github.com/NVIDIA/TransformerEngine.git && \ cd TransformerEngine && \ if [ ! -z $TE_TAG ]; then \ - git fetch origin $TE_TAG && \ - git checkout FETCH_HEAD; \ + git fetch origin $TE_TAG && \ + git checkout FETCH_HEAD; \ fi && \ - git submodule init && git submodule update && \ - NVTE_FRAMEWORK=pytorch NVTE_WITH_USERBUFFERS=1 MPI_HOME=/usr/local/mpi pip install . - -# place any util pkgs here -ARG PYTRITON_VERSION -RUN pip install --upgrade-strategy only-if-needed nvidia-pytriton==$PYTRITON_VERSION -ARG PROTOBUF_VERSION -RUN pip install -U --no-deps protobuf==$PROTOBUF_VERSION -RUN pip install --upgrade-strategy only-if-needed jsonlines + git submodule init && git submodule update # NeMo ARG NEMO_TAG @@ -96,28 +88,26 @@ RUN git clone https://github.com/NVIDIA/NeMo.git && \ cd NeMo && \ git pull && \ if [ ! -z $NEMO_TAG ]; then \ - git fetch origin $NEMO_TAG && \ - git checkout FETCH_HEAD; \ - fi && \ - pip uninstall -y nemo_toolkit sacrebleu && \ - pip install -e ".[nlp]" && \ - cd nemo/collections/nlp/data/language_modeling/megatron && make + git fetch origin $NEMO_TAG && \ + git checkout FETCH_HEAD; \ + fi # MLM -ARG MLM_TAG +ARG MCORE_TAG RUN pip uninstall -y megatron-core && \ git clone https://github.com/NVIDIA/Megatron-LM.git && \ cd Megatron-LM && \ git pull && \ - if [ ! -z $MLM_TAG ]; then \ - git fetch origin $MLM_TAG && \ - git checkout FETCH_HEAD; \ - fi && \ - pip install -e . + if [ ! -z $MCORE_TAG ]; then \ + git fetch origin $MCORE_TAG && \ + git checkout FETCH_HEAD; \ + fi COPY --from=aligner-bump /opt/NeMo-Aligner /opt/NeMo-Aligner +ARG PYTRITON_VERSION +ARG PROTOBUF_VERSION RUN cd /opt/NeMo-Aligner && \ - pip install --no-deps -e . + NVTE_FRAMEWORK=pytorch NVTE_WITH_USERBUFFERS=1 MPI_HOME=/usr/local/mpi pip install . RUN cd TensorRT-LLM && patch -p1 < ../NeMo-Aligner/setup/trtllm.patch diff --git a/setup.py b/setup.py index cc3801455..f298f7e95 100644 --- a/setup.py +++ b/setup.py @@ -62,13 +62,29 @@ # Dependency Loading # # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # +# Function to replace ${VAR} or ${VAR:-default_value} with environment variable or default +def replace_env_vars(text): + # Regex to match ${VAR} or ${VAR:-default_value} + pattern = re.compile(r'\$\{(\w+)(:-([^}]*))?\}') + + def replace_var(match): + var_name = match.group(1) # The environment variable name + default_value = match.group(3) # The default value if provided + + # Return the environment variable value or the default (if available) or empty string + return os.environ.get(var_name, default_value if default_value is not None else f'${{{var_name}}}') + + # Substitute all patterns in the text + return pattern.sub(replace_var, text) def req_file(filename, folder="requirements"): with open(os.path.join(folder, filename), encoding="utf-8") as f: content = f.readlines() - # you may also want to remove whitespace characters - # Example: `\n` at the end of each line - return [x.strip() for x in content if x.strip()] + requirements = [x.strip() for x in content] + requirements = [ + replace_env_vars(line.strip()) for line in requirements if line.strip() and not line.startswith("#") + ] + return requirements install_requires = req_file("requirements.txt", folder="setup") diff --git a/setup/requirements.txt b/setup/requirements.txt index 198d2e07a..769541624 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,4 +1,4 @@ jsonlines -megatron_core>=0.8 -nemo_toolkit[nlp] -nvidia-pytriton +nemo_toolkit[nlp] @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG}#egg=nemo_toolkit[nlp] +nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} +protobuf==${PROTOBUF_VERSION:-4.24.4} From b650e2f1063f05826dd0ed38d8d7a5e1c4e06c45 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 11:34:20 +0100 Subject: [PATCH 03/18] fix Signed-off-by: Oliver Koenig --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f298f7e95..1dd3b2ce0 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ import subprocess from distutils import cmd as distutils_cmd from distutils import log as distutils_log - +import re import setuptools spec = importlib.util.spec_from_file_location("package_info", "nemo_aligner/package_info.py") From 61585c6035e46ec3f4f23076201f92045d47f22a Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 11:34:39 +0100 Subject: [PATCH 04/18] fix Signed-off-by: Oliver Koenig --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 86ee188d0..7998301b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,8 +34,6 @@ git checkout -f $ALIGNER_COMMIT # case 1: ALIGNER_COMMIT is a local branch so we have to apply remote changes to it # case 2: ALIGNER_COMMIT is a commit, so git-pull is expected to fail git pull --rebase || true - -pip install --no-cache-dir --no-deps -e . EOF FROM ${BASE_IMAGE} as final From 62085f48ca1f4378e9a6daf11a0f69513e7cf8e1 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 11:35:56 +0100 Subject: [PATCH 05/18] test Signed-off-by: Oliver Koenig --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7998301b3..59c2c5f55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG MAX_JOBS=8 # Git refs for dependencies ARG TE_TAG=7d576ed25266a17a7b651f2c12e8498f67e0baea ARG PYTRITON_VERSION=0.5.10 -ARG NEMO_TAG=19668e5320a2e2af0199b6d5e0b841993be3a634 # On: main +ARG NEMO_TAG=ko3n1g/build/move-to-req # On: main ARG MCORE_TAG=25059d3bbf68be0751800f3644731df12a88f3f3 # On: main ARG ALIGNER_COMMIT=main ARG TRTLLM_VERSION=v0.13.0 From 58d987d41b03088c3324c4ae67ca631205c39c00 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:39:28 +0000 Subject: [PATCH 06/18] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Signed-off-by: NeMo-Aligner CI --- setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 1dd3b2ce0..29ee9b4bf 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ import subprocess from distutils import cmd as distutils_cmd from distutils import log as distutils_log -import re +import re import setuptools spec = importlib.util.spec_from_file_location("package_info", "nemo_aligner/package_info.py") @@ -65,18 +65,19 @@ # Function to replace ${VAR} or ${VAR:-default_value} with environment variable or default def replace_env_vars(text): # Regex to match ${VAR} or ${VAR:-default_value} - pattern = re.compile(r'\$\{(\w+)(:-([^}]*))?\}') + pattern = re.compile(r"\$\{(\w+)(:-([^}]*))?\}") def replace_var(match): var_name = match.group(1) # The environment variable name default_value = match.group(3) # The default value if provided # Return the environment variable value or the default (if available) or empty string - return os.environ.get(var_name, default_value if default_value is not None else f'${{{var_name}}}') + return os.environ.get(var_name, default_value if default_value is not None else f"${{{var_name}}}") # Substitute all patterns in the text return pattern.sub(replace_var, text) + def req_file(filename, folder="requirements"): with open(os.path.join(folder, filename), encoding="utf-8") as f: content = f.readlines() From 81e182b0943f59893be014e89cf7fce55bdf0559 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 13:29:56 +0100 Subject: [PATCH 07/18] bump py version Signed-off-by: Oliver Koenig --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 09462e9d9..220b20fae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ profile = "black" # black-compatible line_length = 119 # should match black parameters ignore_whitespace = true # ignore whitespace for compatibility with the initial style -py_version = 38 # python 3.8 as a target version +py_version = 39 # python 3.9 as a target version known_first_party = ["nemo", "nemo_aligner"] # FIRSTPARTY section known_third_party = ["examples"] # THIRDPARTY section sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"] From 23b250a44272e9703bc00f558fd8b08f7ecf9de4 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 13:38:41 +0100 Subject: [PATCH 08/18] fix Signed-off-by: Oliver Koenig --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 220b20fae..0544c99c7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,8 @@ profile = "black" # black-compatible line_length = 119 # should match black parameters ignore_whitespace = true # ignore whitespace for compatibility with the initial style -py_version = 39 # python 3.9 as a target version +py_version = 310 # python 3.9 as a target version +requires-python = ">=3.10" known_first_party = ["nemo", "nemo_aligner"] # FIRSTPARTY section known_third_party = ["examples"] # THIRDPARTY section sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"] From 83e57e92e932c494ff41b74016a900bfa0a15c16 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 13:52:00 +0100 Subject: [PATCH 09/18] fix Signed-off-by: Oliver Koenig --- Dockerfile | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59c2c5f55..9c890d28b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,15 +42,15 @@ WORKDIR /opt # needed in case git complains that it can't detect a valid email, this email is fake but works RUN git config --global user.email "worker@nvidia.com" # install latest apex -ARG APEX_TAG -RUN pip uninstall -y apex && \ - git clone https://github.com/NVIDIA/apex && \ - cd apex && \ - if [ ! -z $APEX_TAG ]; then \ - git fetch origin $APEX_TAG && \ - git checkout FETCH_HEAD; \ - fi && \ - pip install -v --no-build-isolation --disable-pip-version-check --no-cache-dir --config-settings "--build-option=--cpp_ext --cuda_ext --fast_layer_norm --distributed_adam --deprecated_fused_adam" ./ +# ARG APEX_TAG +# RUN pip uninstall -y apex && \ +# git clone https://github.com/NVIDIA/apex && \ +# cd apex && \ +# if [ ! -z $APEX_TAG ]; then \ +# git fetch origin $APEX_TAG && \ +# git checkout FETCH_HEAD; \ +# fi && \ +# pip install -v --no-build-isolation --disable-pip-version-check --no-cache-dir --config-settings "--build-option=--cpp_ext --cuda_ext --fast_layer_norm --distributed_adam --deprecated_fused_adam" ./ # Git LFS RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \ @@ -58,15 +58,15 @@ RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.d git lfs install && \ apt-get clean -# TRTLLM -ARG TRTLLM_VERSION -RUN git clone https://github.com/NVIDIA/TensorRT-LLM.git && \ - cd TensorRT-LLM && \ - git checkout ${TRTLLM_VERSION} && \ - . docker/common/install_tensorrt.sh && \ - python3 ./scripts/build_wheel.py --job_count $(nproc) --trt_root /usr/local/tensorrt --python_bindings --benchmarks && \ - pip install -e . -ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda-12/compat/lib.real/ +# # TRTLLM +# ARG TRTLLM_VERSION +# RUN git clone https://github.com/NVIDIA/TensorRT-LLM.git && \ +# cd TensorRT-LLM && \ +# git checkout ${TRTLLM_VERSION} && \ +# . docker/common/install_tensorrt.sh && \ +# python3 ./scripts/build_wheel.py --job_count $(nproc) --trt_root /usr/local/tensorrt --python_bindings --benchmarks && \ +# pip install -e . +# ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda-12/compat/lib.real/ # install TransformerEngine ARG MAX_JOBS From e4b7fa1aaab1d329d61598e39923b597bf609a2d Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 14:00:51 +0100 Subject: [PATCH 10/18] fix Signed-off-by: Oliver Koenig --- setup/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/requirements.txt b/setup/requirements.txt index 769541624..94306ab85 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,4 +1,4 @@ jsonlines -nemo_toolkit[nlp] @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG}#egg=nemo_toolkit[nlp] +nemo_toolkit @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG} nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} protobuf==${PROTOBUF_VERSION:-4.24.4} From 2e15b886fef046aa1baf330f0703ce36b067f871 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 14:16:31 +0100 Subject: [PATCH 11/18] fix Signed-off-by: Oliver Koenig --- setup/requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup/requirements.txt b/setup/requirements.txt index 94306ab85..a99b3768b 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,4 +1,4 @@ -jsonlines -nemo_toolkit @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG} -nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} -protobuf==${PROTOBUF_VERSION:-4.24.4} +# jsonlines +nemo_toolkit[nlp] @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG}#egg=nemo_toolkit[nlp] +# nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} +# protobuf==${PROTOBUF_VERSION:-4.24.4} From fc703d0f90564ee1d4d29d369b4e2631f2f2a1b8 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 14:25:05 +0100 Subject: [PATCH 12/18] fix Signed-off-by: Oliver Koenig --- setup/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/requirements.txt b/setup/requirements.txt index a99b3768b..769541624 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,4 +1,4 @@ -# jsonlines +jsonlines nemo_toolkit[nlp] @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG}#egg=nemo_toolkit[nlp] -# nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} -# protobuf==${PROTOBUF_VERSION:-4.24.4} +nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} +protobuf==${PROTOBUF_VERSION:-4.24.4} From 690cf32b975c3da8b16a1d9aed29d191abb53d54 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 14:29:22 +0100 Subject: [PATCH 13/18] test Signed-off-by: Oliver Koenig --- setup/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/requirements.txt b/setup/requirements.txt index 769541624..c0c3e53ca 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,4 +1,4 @@ jsonlines nemo_toolkit[nlp] @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG}#egg=nemo_toolkit[nlp] -nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} -protobuf==${PROTOBUF_VERSION:-4.24.4} +# nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} +# protobuf==${PROTOBUF_VERSION:-4.24.4} From 2aff3e503647a629269821bd55d7bc38d9aeba26 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 14:32:15 +0100 Subject: [PATCH 14/18] fix Signed-off-by: Oliver Koenig --- setup/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/requirements.txt b/setup/requirements.txt index c0c3e53ca..bb40cfe44 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,4 +1,4 @@ jsonlines nemo_toolkit[nlp] @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG}#egg=nemo_toolkit[nlp] -# nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} +nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} # protobuf==${PROTOBUF_VERSION:-4.24.4} From d4a0f57ad8380601a7e8fc0e00ca593755371fba Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 14:35:38 +0100 Subject: [PATCH 15/18] fix Signed-off-by: Oliver Koenig --- setup/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/requirements.txt b/setup/requirements.txt index bb40cfe44..52f6c9c63 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,4 +1,4 @@ jsonlines nemo_toolkit[nlp] @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG}#egg=nemo_toolkit[nlp] -nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} -# protobuf==${PROTOBUF_VERSION:-4.24.4} +# nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} +protobuf==${PROTOBUF_VERSION:-4.24.4} From 33495e8a6f8789135aebdcbf05477f70b85c196d Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 14:40:02 +0100 Subject: [PATCH 16/18] fix Signed-off-by: Oliver Koenig --- setup/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/requirements.txt b/setup/requirements.txt index 52f6c9c63..719f6cb58 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,4 +1,4 @@ jsonlines nemo_toolkit[nlp] @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG}#egg=nemo_toolkit[nlp] -# nvidia-pytriton==${PYTRITON_VERSION:-0.5.10} +nvidia-pytriton #==${PYTRITON_VERSION:-0.5.10} protobuf==${PROTOBUF_VERSION:-4.24.4} From 1b9223034dde9f2d00cf3a4de653620a491057f5 Mon Sep 17 00:00:00 2001 From: Oliver Koenig Date: Fri, 22 Nov 2024 14:45:04 +0100 Subject: [PATCH 17/18] fix Signed-off-by: Oliver Koenig --- setup/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/requirements.txt b/setup/requirements.txt index 719f6cb58..3eea41f37 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -2,3 +2,4 @@ jsonlines nemo_toolkit[nlp] @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG}#egg=nemo_toolkit[nlp] nvidia-pytriton #==${PYTRITON_VERSION:-0.5.10} protobuf==${PROTOBUF_VERSION:-4.24.4} +datasets>=3.0.1 \ No newline at end of file From 01feea4920aeedfe39c35312c76f5d1430003616 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:45:25 +0000 Subject: [PATCH 18/18] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Signed-off-by: NeMo-Aligner CI --- setup/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/requirements.txt b/setup/requirements.txt index 3eea41f37..dcccd2245 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,5 +1,5 @@ +datasets>=3.0.1 jsonlines nemo_toolkit[nlp] @ git+https://github.com/NVIDIA/NeMo.git@${NEMO_TAG}#egg=nemo_toolkit[nlp] nvidia-pytriton #==${PYTRITON_VERSION:-0.5.10} protobuf==${PROTOBUF_VERSION:-4.24.4} -datasets>=3.0.1 \ No newline at end of file