Merge branch 'main' into new_model_integrations

ibm-granite · Jan 6, 2025 · 46b8645 · 46b8645
2 parents a6f8175 + f51b65e
commit 46b8645
Show file tree

Hide file tree

Showing 42 changed files with 1,578 additions and 18,154 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,7 +5,7 @@
   },
   "python.testing.pytestArgs": [
     "tests",
-    "services/inference"
+    "services"
   ],
   "python.testing.unittestEnabled": false,
   "python.testing.pytestEnabled": true,

diff --git a/notebooks/hfdemo/tinytimemixer/full_benchmarking/foundts_leaderboard/ttm-b1-512.sh b/notebooks/hfdemo/tinytimemixer/full_benchmarking/foundts_leaderboard/ttm-b1-512.sh
@@ -2,7 +2,7 @@ data_root_path=$1
 for cl in 512; do 
     for fl in 96 192 336 720; do
         python ../ttm_full_benchmarking.py --context_length $cl --forecast_length $fl --num_epochs 50 --num_workers 16 \
-        --hf_model_path ibm/ttm-research-r2  \
+        --hf_model_path ibm-research/ttm-research-r2  \
         --data_root_path $data_root_path \
         --fewshot 0 \
         --plot 0 \

diff --git a/notebooks/hfdemo/tinytimemixer/full_benchmarking/research-use-r2.sh b/notebooks/hfdemo/tinytimemixer/full_benchmarking/research-use-r2.sh
@@ -3,7 +3,7 @@ for cl in 512 1024 1536; do
     for fl in 96 192 336 720; do
         python ttm_full_benchmarking.py --context_length $cl --forecast_length $fl \
         --num_epochs 50 --num_workers 16 --enable_prefix_tuning 1 \
-        --hf_model_path ibm/ttm-research-r2 \
+        --hf_model_path ibm-research/ttm-research-r2 \
         --data_root_path $data_root_path \
         --save_dir results-research-use-r2/
     done;

diff --git a/...er/full_benchmarking/sample_notebooks/research_use/ttm-r2_freq_benchmarking_1024_96.ipynb b/...er/full_benchmarking/sample_notebooks/research_use/ttm-r2_freq_benchmarking_1024_96.ipynb
@@ -132,14 +132,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
     "# TTM models for Only Research and Academic (Non-Commercial) Use are here: https://huggingface.co/ibm/ttm-research-r2\n",
     "# Please provide the branch name properly based on context_len and forecast_len\n",
     "\n",
-    "hf_model_path = \"ibm/ttm-research-r2\"\n",
+    "hf_model_path = \"ibm-research/ttm-research-r2\"\n",
     "if context_length == 512:\n",
     "    hf_model_branch = \"main\"\n",
     "elif context_length == 1024 or context_length == 1536:\n",

diff --git a/...er/full_benchmarking/sample_notebooks/research_use/ttm-r2_freq_benchmarking_1536_96.ipynb b/...er/full_benchmarking/sample_notebooks/research_use/ttm-r2_freq_benchmarking_1536_96.ipynb
@@ -132,14 +132,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
-    "# TTM models for Only Research and Academic (Non-Commercial) Use are here: https://huggingface.co/ibm/ttm-research-r2\n",
+    "# TTM models for Only Research and Academic (Non-Commercial) Use are here: https://huggingface.co/ibm-research/ttm-research-r2\n",
     "# Please provide the branch name properly based on context_len and forecast_len\n",
     "\n",
-    "hf_model_path = \"ibm/ttm-research-r2\"\n",
+    "hf_model_path = \"ibm-research/ttm-research-r2\"\n",
     "if context_length == 512:\n",
     "    hf_model_branch = \"main\"\n",
     "elif context_length == 1024 or context_length == 1536:\n",

diff --git a/...xer/full_benchmarking/sample_notebooks/research_use/ttm-r2_freq_benchmarking_512_96.ipynb b/...xer/full_benchmarking/sample_notebooks/research_use/ttm-r2_freq_benchmarking_512_96.ipynb
@@ -132,14 +132,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
-    "# TTM models for Only Research and Academic (Non-Commercial) Use are here: https://huggingface.co/ibm/ttm-research-r2\n",
+    "# TTM models for Only Research and Academic (Non-Commercial) Use are here: https://huggingface.co/ibm-research/ttm-research-r2\n",
     "# Please provide the branch name properly based on context_len and forecast_len\n",
     "\n",
-    "hf_model_path = \"ibm/ttm-research-r2\"\n",
+    "hf_model_path = \"ibm-research/ttm-research-r2\"\n",
     "if context_length == 512:\n",
     "    hf_model_branch = \"main\"\n",
     "elif context_length == 1024 or context_length == 1536:\n",

diff --git a/...hfdemo/tinytimemixer/full_benchmarking/sample_notebooks/ttm-r1_benchmarking_1024_96.ipynb b/...hfdemo/tinytimemixer/full_benchmarking/sample_notebooks/ttm-r1_benchmarking_1024_96.ipynb
@@ -15,7 +15,7 @@
     "\n",
     "1. IBM Granite TTM-R1 pre-trained models can be found here: [Granite-TTM-R1 Model Card](https://huggingface.co/ibm-granite/granite-timeseries-ttm-r1)\n",
     "2. IBM Granite TTM-R2 pre-trained models can be found here: [Granite-TTM-R2 Model Card](https://huggingface.co/ibm-granite/granite-timeseries-ttm-r2)\n",
-    "3. Research-use (non-commercial use only) TTM-R2 pre-trained models can be found here: [Research-Use-TTM-R2](https://huggingface.co/ibm/ttm-research-r2)"
+    "3. Research-use (non-commercial use only) TTM-R2 pre-trained models can be found here: [Research-Use-TTM-R2](https://huggingface.co/ibm-research/ttm-research-r2)"
    ]
   },
   {

diff --git a/.../hfdemo/tinytimemixer/full_benchmarking/sample_notebooks/ttm-r1_benchmarking_512_96.ipynb b/.../hfdemo/tinytimemixer/full_benchmarking/sample_notebooks/ttm-r1_benchmarking_512_96.ipynb
@@ -15,7 +15,7 @@
     "\n",
     "1. IBM Granite TTM-R1 pre-trained models can be found here: [Granite-TTM-R1 Model Card](https://huggingface.co/ibm-granite/granite-timeseries-ttm-r1)\n",
     "2. IBM Granite TTM-R2 pre-trained models can be found here: [Granite-TTM-R2 Model Card](https://huggingface.co/ibm-granite/granite-timeseries-ttm-r2)\n",
-    "3. Research-use (non-commercial use only) TTM-R2 pre-trained models can be found here: [Research-Use-TTM-R2](https://huggingface.co/ibm/ttm-research-r2)"
+    "3. Research-use (non-commercial use only) TTM-R2 pre-trained models can be found here: [Research-Use-TTM-R2](https://huggingface.co/ibm-research/ttm-research-r2)"
    ]
   },
   {

diff --git a/...hfdemo/tinytimemixer/full_benchmarking/sample_notebooks/ttm-r2_benchmarking_1024_96.ipynb b/...hfdemo/tinytimemixer/full_benchmarking/sample_notebooks/ttm-r2_benchmarking_1024_96.ipynb
@@ -15,7 +15,7 @@
     "\n",
     "1. IBM Granite TTM-R1 pre-trained models can be found here: [Granite-TTM-R1 Model Card](https://huggingface.co/ibm-granite/granite-timeseries-ttm-r1)\n",
     "2. IBM Granite TTM-R2 pre-trained models can be found here: [Granite-TTM-R2 Model Card](https://huggingface.co/ibm-granite/granite-timeseries-ttm-r2)\n",
-    "3. Research-use (non-commercial use only) TTM-R2 pre-trained models can be found here: [Research-Use-TTM-R2](https://huggingface.co/ibm/ttm-research-r2)"
+    "3. Research-use (non-commercial use only) TTM-R2 pre-trained models can be found here: [Research-Use-TTM-R2](https://huggingface.co/ibm-research/ttm-research-r2)"
    ]
   },
   {

diff --git a/.../hfdemo/tinytimemixer/full_benchmarking/sample_notebooks/ttm-r2_benchmarking_512_96.ipynb b/.../hfdemo/tinytimemixer/full_benchmarking/sample_notebooks/ttm-r2_benchmarking_512_96.ipynb
@@ -15,7 +15,7 @@
     "\n",
     "1. IBM Granite TTM-R1 pre-trained models can be found here: [Granite-TTM-R1 Model Card](https://huggingface.co/ibm-granite/granite-timeseries-ttm-r1)\n",
     "2. IBM Granite TTM-R2 pre-trained models can be found here: [Granite-TTM-R2 Model Card](https://huggingface.co/ibm-granite/granite-timeseries-ttm-r2)\n",
-    "3. Research-use (non-commercial use only) TTM-R2 pre-trained models can be found here: [Research-Use-TTM-R2](https://huggingface.co/ibm/ttm-research-r2)"
+    "3. Research-use (non-commercial use only) TTM-R2 pre-trained models can be found here: [Research-Use-TTM-R2](https://huggingface.co/ibm-research/ttm-research-r2)"
    ]
   },
   {

diff --git a/notebooks/hfdemo/tinytimemixer/full_benchmarking/ttm_full_benchmarking.py b/notebooks/hfdemo/tinytimemixer/full_benchmarking/ttm_full_benchmarking.py
@@ -4,7 +4,7 @@
 
 1. TTM-Granite-R1 pre-trained models can be found here: [TTM-R1 Model Card](https://huggingface.co/ibm-granite/granite-timeseries-ttm-r1)
 2. TTM-Granite-R2 pre-trained models can be found here: [TTM-R2 Model Card](https://huggingface.co/ibm-granite/granite-timeseries-ttm-r2)
-3. TTM-Research-Use pre-trained models can be found here: [TTM-Research-Use Model Card](https://huggingface.co/ibm/ttm-research-r2)
+3. TTM-Research-Use pre-trained models can be found here: [TTM-Research-Use Model Card](https://huggingface.co/ibm-research/ttm-research-r2)
 
 Every model card has a suite of TTM models. Please read the respective model cards for usage instructions.
 """

diff --git a/notebooks/hfdemo/ttm_getting_started.ipynb b/notebooks/hfdemo/ttm_getting_started.ipynb
diff --git a/services/finetuning/.gitignore b/services/finetuning/.gitignore
@@ -0,0 +1,2 @@
+data/*
+mytest-tsfm
diff --git a/services/finetuning/Makefile b/services/finetuning/Makefile
@@ -14,8 +14,16 @@ boilerplate:
 image:
 	$(CONTAINER_BUILDER) build -t tsfmfinetuning -f Dockerfile .
 
-test_local: boilerplate
-	pytest tests
+clone_models:
+	git lfs install || true
+	git clone https://huggingface.co/ibm-research/test-tsfm mytest-tsfm || true
+
+
+fetchdata:
+	python tests/fetchdata.py
+
+test_local: boilerplate fetchdata clone_models
+	pytest -s tests
 
 install_dev: boilerplate
 	pip install poetry && poetry install --with dev