Skip to content

Commit e745b87

Browse files
authored
ci: Remove submodule and clone internvideo (#1070)
* Remove submodule Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * Update dockerfile to clone internvideo and apply patch Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * Update internvideo import Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * Uv add internvideo for cpu tests Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * Update uv lock file Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * Update external path Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * cd into repo Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * Checkout and patch for cpu test Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * Correct typo Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * Use full commit sha Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * Update internvideo package data config json Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> * Add copyright header for patch file Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com> --------- Signed-off-by: Dong Hyuk Chang <donghyukc@nvidia.com>
1 parent 64fa7e6 commit e745b87

File tree

8 files changed

+433
-305
lines changed

8 files changed

+433
-305
lines changed

.github/workflows/cicd-main.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ jobs:
140140
- uses: actions/checkout@v4
141141
with:
142142
submodules: recursive
143+
- uses: actions/checkout@v4
144+
with:
145+
repository: OpenGVLab/InternVideo
146+
path: InternVideo
147+
ref: 09d872e5093296c6f36b8b3a91fc511b76433bf7
143148
- name: Optionally free up space on Ubuntu
144149
run: |
145150
sudo rm -rf /usr/share/dotnet
@@ -152,7 +157,9 @@ jobs:
152157
python-version: ${{ matrix.python-version }}
153158
- name: Run tests ${{ matrix.folder }} (CPU)
154159
run: |
160+
cd InternVideo && patch -p1 < ../external/intern_video2_multimodal.patch && cd ..
155161
uv sync --link-mode copy --locked --extra audio_cpu --extra text_cpu --extra video_cpu --group test
162+
uv add InternVideo/InternVideo2/multi_modality
156163
uv run coverage run --branch --source=nemo_curator -m pytest -v tests/${{ matrix.folder }} -m "not gpu"
157164
158165
- name: Generate report

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "nemo_curator/internvideo2_multi_modality"]
2-
path = nemo_curator/internvideo2_multi_modality
3-
url = https://github.com/thomasdhc/InternVideo2MultiModality.git

docker/Dockerfile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,21 @@ RUN bash install_ffmpeg.sh && \
6464

6565
FROM nemo_curator_dep AS nemo_curator
6666

67+
ARG INTERN_VIDEO_COMMIT=09d872e5093296c6f36b8b3a91fc511b76433bf7
68+
COPY external/intern_video2_multimodal.patch .
69+
# Clone InternVideo (Video curation dependency)
70+
RUN git clone https://github.com/OpenGVLab/InternVideo.git && \
71+
cd InternVideo && \
72+
git checkout ${INTERN_VIDEO_COMMIT} && \
73+
patch -p1 < /opt/intern_video2_multimodal.patch && \
74+
rm /opt/intern_video2_multimodal.patch
75+
76+
# Install Curator
6777
COPY . /opt/Curator
6878
RUN cd /opt/Curator && \
6979
uv sync --locked --only-group build && \
70-
uv sync --link-mode copy --locked --extra all --all-groups
80+
uv sync --link-mode copy --locked --extra all --all-groups && \
81+
uv add /opt/InternVideo/InternVideo2/multi_modality
7182

7283
COPY <<EOF /opt/venv/env.sh
7384
export UV_PROJECT_ENVIRONMENT=/opt/venv

0 commit comments

Comments
 (0)