open-mmlab
diff --git a/‎.circleci/test.yml‎
Lines changed: 2 additions & 0 deletions b/‎.circleci/test.yml‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎.dev_scripts/train_benchmark.py‎
Lines changed: 1 addition & 2 deletions b/‎.dev_scripts/train_benchmark.py‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎.github/workflows/merge_stage_test.yml‎
Lines changed: 7 additions & 2 deletions b/‎.github/workflows/merge_stage_test.yml‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎.github/workflows/pr_stage_test.yml‎
Lines changed: 5 additions & 1 deletion b/‎.github/workflows/pr_stage_test.yml‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎.gitignore‎
Lines changed: 5 additions & 0 deletions b/‎.gitignore‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 2 additions & 1 deletion b/‎README.md‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎README_zh-CN.md‎
Lines changed: 2 additions & 1 deletion b/‎README_zh-CN.md‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎configs/cain/cain_g1b32_1xb5_vimeo90k-triplet.py‎
Lines changed: 1 addition & 1 deletion b/‎configs/cain/cain_g1b32_1xb5_vimeo90k-triplet.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎configs/esrgan/esrgan_psnr-x4c64b23g32_1xb16-1000k_div2k.py‎
Lines changed: 2 additions & 2 deletions b/‎configs/esrgan/esrgan_psnr-x4c64b23g32_1xb16-1000k_div2k.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎configs/esrgan/esrgan_x4c64b23g32_1xb16-400k_div2k.py‎
Lines changed: 5 additions & 3 deletions b/‎configs/esrgan/esrgan_x4c64b23g32_1xb16-400k_div2k.py‎
Lines changed: 5 additions & 3 deletions
@@ -64,6 +64,7 @@ jobs:
             mim install 'mmcv >= 2.0.0rc1'
             mim install 'mmdet >= 3.0.0rc2'
             pip install -r requirements/tests.txt
+            pip install git+https://github.com/openai/CLIP.git
       - run:
           name: Build and install
           command: |
@@ -108,6 +109,7 @@ jobs:
             docker exec mmedit mim install 'mmcv >= 2.0.0rc1'
             docker exec mmedit mim install 'mmdet >= 3.0.0rc2'
             docker exec mmedit pip install -r requirements/tests.txt
+            docker exec mmedit pip install git+https://github.com/openai/CLIP.git
       - run:
           name: Build and install
           command: |
 
@@ -243,8 +243,7 @@ def create_train_job_batch(commands, model_info, args, port, script_name):
         job_script += (f'#SBATCH --gres=gpu:{n_gpus}\n'
                        f'#SBATCH --ntasks-per-node={min(n_gpus, 8)}\n'
                        f'#SBATCH --ntasks={n_gpus}\n'
-                       f'#SBATCH --cpus-per-task={args.cpus_per_job}\n'
-                       f'#SBATCH --kill-on-bad-exit=1\n\n')
+                       f'#SBATCH --cpus-per-task={args.cpus_per_job}\n\n')
     else:
         job_script += '\n\n' + 'export CUDA_VISIBLE_DEVICES=-1\n'
 
 
@@ -47,7 +47,9 @@ jobs:
           mim install 'mmcv >= 2.0.0rc1'
           mim install 'mmdet >= 3.0.0rc2'
       - name: Install other dependencies
-        run: pip install -r requirements/tests.txt
+        run: |
+          pip install -r requirements/tests.txt
+          pip install git+https://github.com/openai/CLIP.git
       - name: Build and install
         run: rm -rf .eggs && pip install -e .
       - name: Run unittests and generate coverage report
@@ -95,7 +97,9 @@ jobs:
           mim install 'mmcv >= 2.0.0rc1'
           mim install 'mmdet >= 3.0.0rc2'
       - name: Install other dependencies
-        run: pip install -r requirements/tests.txt
+        run: |
+          pip install -r requirements/tests.txt
+          pip install git+https://github.com/openai/CLIP.git
       - name: Build and install
         run: rm -rf .eggs && pip install -e .
       - name: Run unittests and generate coverage report
@@ -181,6 +185,7 @@ jobs:
           mim install 'mmcv >= 2.0.0rc1'
           mim install 'mmdet >= 3.0.0rc2'
           python -m pip install -r requirements/tests.txt
+          python -m pip install git+https://github.com/openai/CLIP.git
       - name: Build and install
         run: |
           python -m pip install -e .
 
@@ -41,7 +41,9 @@ jobs:
           mim install 'mmcv >= 2.0.0rc1'
           mim install 'mmdet >= 3.0.0rc2'
       - name: Install other dependencies
-        run: pip install -r requirements/tests.txt
+        run: |
+          pip install -r requirements/tests.txt
+          pip install git+https://github.com/openai/CLIP.git
       - name: Build and install
         run: rm -rf .eggs && pip install -e .
       - name: Run unittests and generate coverage report
@@ -97,6 +99,7 @@ jobs:
           mim install 'mmcv >= 2.0.0rc1'
           mim install 'mmdet >= 3.0.0rc2'
           pip install -r requirements/tests.txt
+          pip install git+https://github.com/openai/CLIP.git
       - name: Build and install
         run: |
           python setup.py check -m -s
@@ -131,6 +134,7 @@ jobs:
           mim install 'mmcv >= 2.0.0rc1'
           mim install 'mmdet >= 3.0.0rc2'
           python -m pip install -r requirements/tests.txt
+          pip install git+https://github.com/openai/CLIP.git
       - name: Build and install
         run: |
           python -m pip install -e .
 
@@ -70,6 +70,7 @@ docs/en/_tmp/
 docs/zh_cn/_build/
 docs/zh_cn/_tmp/
 requirements/src/
+docs/en/api/generated
 
 # PyBuilder
 target/
@@ -140,3 +141,7 @@ out/*.png
 
 # MacOS
 .DS_Store
+
+# Slurm
+batchscript-*
+*.out
@@ -106,12 +106,13 @@ hope MMEditing could provide better experience.
 
 ### 🌟 Preview of 1.x version
 
-A brand new version of [**MMEditing v1.0.0rc2**](https://github.com/open-mmlab/mmediting/releases/tag/v1.0.0rc2) was released in 02/11/2022:
+A brand new version of [**MMEditing v1.0.0rc3**](https://github.com/open-mmlab/mmediting/releases/tag/v1.0.0rc3) was released in 09/11/2022:
 
 - Support all the tasks, models, metrics, and losses in [MMGeneration](https://github.com/open-mmlab/mmgeneration) 😍。
 - Unifies interfaces of all components based on [MMEngine](https://github.com/open-mmlab/mmengine).
 - Support patch-based and slider-based image and video comparison viewer.
 - Support image colorization.
+- Convert `mmdet` and `clip` to optional requirements.
 
 Find more new features in [1.x branch](https://github.com/open-mmlab/mmediting/tree/1.x). Issues and PRs are welcome!
 
 
@@ -105,12 +105,13 @@ MMEditing 缜密地设计新的框架并将其精心实现，希望能够为您
 
 ### 🌟 1.x 预览版本
 
-全新的 [**MMEditing v1.0.0rc2**](https://github.com/open-mmlab/mmediting/releases/tag/v1.0.0rc2) 已经在 02/11/2022 发布:
+全新的 [**MMEditing v1.0.0rc3**](https://github.com/open-mmlab/mmediting/releases/tag/v1.0.0rc3) 已经在 09/11/2022 发布:
 
 - 支持[MMGeneration](https://github.com/open-mmlab/mmgeneration)中的全量任务、模型、优化函数和评价指标 😍。
 - 基于[MMEngine](https://github.com/open-mmlab/mmengine)统一了各组件接口。
 - 支持基于图像子块以及滑动条的图像和视频比较可视化工具。
 - 支持图像上色任务。
+- 将 `mmdet` 与 `clip` 切换为可选依赖
 
 在[1.x 分支](https://github.com/open-mmlab/mmediting/tree/1.x)中发现更多特性！欢迎提 Issues 和 PRs！
 
 
@@ -83,7 +83,7 @@
     num_workers=32,
     batch_size=32,  # 1 gpu
     persistent_workers=False,
-    sampler=dict(type='InfiniteSampler', shuffle=True),
+    sampler=dict(type='DefaultSampler', shuffle=True),
     dataset=dict(
         type=train_dataset_type,
         ann_file='tri_trainlist.txt',
 
@@ -90,8 +90,8 @@
     sampler=dict(type='DefaultSampler', shuffle=False),
     dataset=dict(
         type=dataset_type,
-        metainfo=dict(dataset_type='set5', task_name='sisr'),
-        data_root=data_root + '/Set5',
+        metainfo=dict(dataset_type='set14', task_name='sisr'),
+        data_root=data_root + '/Set14',
         data_prefix=dict(img='LRbicx4', gt='GTmod12'),
         pipeline=val_pipeline))
 
 
@@ -5,12 +5,13 @@
 
 scale = 4
 
-# load_from = 'https://download.openmmlab.com/mmediting/restorers/esrgan/esrgan_x4c64b23g32_1x16_400k_div2k_20200508-f8ccaf3b.pth'  # noqa
-
 # DistributedDataParallel
 model_wrapper_cfg = dict(type='MMSeparateDistributedDataParallel')
 
 # model settings
+pretrain_generator_url = (
+    'https://download.openmmlab.com/mmediting/restorers/esrgan'
+    '/esrgan_psnr_x4c64b23g32_1x16_1000k_div2k_20200420-bf5c993c.pth')
 model = dict(
     type='ESRGAN',
     generator=dict(
@@ -20,7 +21,8 @@
         mid_channels=64,
         num_blocks=23,
         growth_channels=32,
-        upscale_factor=scale),
+        upscale_factor=scale,
+        init_cfg=dict(type='Pretrained', checkpoint=pretrain_generator_url)),
     discriminator=dict(type='ModifiedVGG', in_channels=3, mid_channels=64),
     pixel_loss=dict(type='L1Loss', loss_weight=1e-2, reduction='mean'),
     perceptual_loss=dict(