Merge branch 'intel:main' into fix-fine-tuning-bugs

harborn · Jul 17, 2024 · e1b0418 · e1b0418
2 parents 3ff4f88 + df24aa2
commit e1b0418
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 32 deletions.
diff --git a/.github/workflows/workflow_finetune.yml b/.github/workflows/workflow_finetune.yml
@@ -11,10 +11,10 @@ on:
         default: '10.1.2.13:5000/llmray-build'
       http_proxy:
         type: string
-        default: 'http://10.24.221.169:912'
+        default: 'http://proxy-prc.intel.com:912'
       https_proxy:
         type: string
-        default: 'http://10.24.221.169:912'
+        default: 'http://proxy-prc.intel.com:912'
       runner_config_path:
         type: string
         default: '/home/ci/llm-ray-actions-runner'

diff --git a/.github/workflows/workflow_finetune_gpu.yml b/.github/workflows/workflow_finetune_gpu.yml
@@ -8,10 +8,10 @@ on:
         default: '10.1.2.13:5000/llmray-build'
       http_proxy:
         type: string
-        default: 'http://10.24.221.169:912'
+        default: 'http://proxy-prc.intel.com:912'
       https_proxy:
         type: string
-        default: 'http://10.24.221.169:912'
+        default: 'http://proxy-prc.intel.com:912'
 
 jobs:
   finetune-gpu:

diff --git a/.github/workflows/workflow_inference.yml b/.github/workflows/workflow_inference.yml
@@ -11,10 +11,10 @@ on:
         default: '10.1.2.13:5000/llmray-build'
       http_proxy:
         type: string
-        default: 'http://10.24.221.169:912'
+        default: 'http://proxy-prc.intel.com:912'
       https_proxy:
         type: string
-        default: 'http://10.24.221.169:912'
+        default: 'http://proxy-prc.intel.com:912'
       runner_config_path:
         type: string
         default: '/home/ci/llm-ray-actions-runner'

diff --git a/.github/workflows/workflow_orders_nightly.yml b/.github/workflows/workflow_orders_nightly.yml
@@ -1,8 +1,8 @@
 name: Nightly
 
-on:
-  schedule:
-    - cron: "0 16 * * *"
+on: []
+  # schedule:
+  #   - cron: "0 16 * * *"
 
 jobs:
 

diff --git a/.github/workflows/workflow_orders_on_merge.yml b/.github/workflows/workflow_orders_on_merge.yml
@@ -16,18 +16,18 @@ jobs:
     needs: Lint
     uses: ./.github/workflows/workflow_tests.yml
 
-  Inference:
-    needs: Lint
-    uses: ./.github/workflows/workflow_inference.yml
+  # Inference:
+  #   needs: Lint
+  #   uses: ./.github/workflows/workflow_inference.yml
 
-  Inference_Gaudi:
-    needs: Lint
-    uses: ./.github/workflows/workflow_inference_gaudi2.yml
+  # Inference_Gaudi:
+  #   needs: Lint
+  #   uses: ./.github/workflows/workflow_inference_gaudi2.yml
 
-  Finetune:
-    needs: Lint
-    uses: ./.github/workflows/workflow_finetune.yml
+  # Finetune:
+  #   needs: Lint
+  #   uses: ./.github/workflows/workflow_finetune.yml
 
-  Benchmark:
-    needs: Lint
-    uses: ./.github/workflows/workflow_test_benchmark.yml
+  # Benchmark:
+  #   needs: Lint
+  #   uses: ./.github/workflows/workflow_test_benchmark.yml
diff --git a/.github/workflows/workflow_orders_on_pr.yml b/.github/workflows/workflow_orders_on_pr.yml
@@ -16,14 +16,14 @@ jobs:
     needs: Lint
     uses: ./.github/workflows/workflow_tests.yml
 
-  Inference:
-    needs: Lint
-    uses: ./.github/workflows/workflow_inference.yml
+  # Inference:
+  #   needs: Lint
+  #   uses: ./.github/workflows/workflow_inference.yml
 
-  Inference_Gaudi:
-    needs: Lint
-    uses: ./.github/workflows/workflow_inference_gaudi2.yml
+  # Inference_Gaudi:
+  #   needs: Lint
+  #   uses: ./.github/workflows/workflow_inference_gaudi2.yml
 
-  Finetune:
-    needs: Lint
-    uses: ./.github/workflows/workflow_finetune.yml
+  # Finetune:
+  #   needs: Lint
+  #   uses: ./.github/workflows/workflow_finetune.yml
diff --git a/dev/docker/Dockerfile.cpu_and_deepspeed b/dev/docker/Dockerfile.cpu_and_deepspeed
@@ -2,6 +2,7 @@
 FROM ubuntu:22.04
 
 ENV LANG C.UTF-8
+ENV HF_ENDPOINT "https://hf-mirror.com"
 
 WORKDIR /root/llm-on-ray
 

diff --git a/dev/docker/Dockerfile.cpu_and_deepspeed.pip_non_editable b/dev/docker/Dockerfile.cpu_and_deepspeed.pip_non_editable
@@ -2,6 +2,7 @@
 FROM ubuntu:22.04
 
 ENV LANG C.UTF-8
+ENV HF_ENDPOINT "https://hf-mirror.com"
 
 WORKDIR /root/llm-on-ray
 

diff --git a/dev/docker/Dockerfile.ipex-llm b/dev/docker/Dockerfile.ipex-llm
@@ -2,6 +2,7 @@
 FROM ubuntu:22.04
 
 ENV LANG C.UTF-8
+ENV HF_ENDPOINT "https://hf-mirror.com"
 
 WORKDIR /root/llm-on-ray
 

diff --git a/dev/docker/Dockerfile.vllm b/dev/docker/Dockerfile.vllm
@@ -2,6 +2,7 @@
 FROM ubuntu:22.04
 
 ENV LANG C.UTF-8
+ENV HF_ENDPOINT "https://hf-mirror.com"
 
 WORKDIR /root/llm-on-ray
 

diff --git a/dev/scripts/ci-functions.sh b/dev/scripts/ci-functions.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-HTTP_PROXY='http://10.24.221.169:912'
-HTTPS_PROXY='http://10.24.221.169:912'
+HTTP_PROXY='http://proxy-prc.intel.com:912'
+HTTPS_PROXY='http://proxy-prc.intel.com:912'
 MODEL_CACHE_PATH_LOACL='/root/.cache/huggingface/hub'
 CODE_CHECKOUT_PATH_LOCAL='/root/llm-on-ray'