diff --git a/.circleci/test.yml b/.circleci/test.yml index 8ead3de0a8..efa9342303 100644 --- a/.circleci/test.yml +++ b/.circleci/test.yml @@ -98,10 +98,10 @@ jobs: type: string cuda: type: enum - enum: ["10.1", "10.2", "11.1"] + enum: ["11.0"] cudnn: type: integer - default: 7 + default: 8 machine: image: ubuntu-2004-cuda-11.4:202110-01 # docker_layer_caching: true @@ -114,9 +114,15 @@ jobs: docker build .circleci/docker -t mmaction:gpu --build-arg PYTORCH=<< parameters.torch >> --build-arg CUDA=<< parameters.cuda >> --build-arg CUDNN=<< parameters.cudnn >> docker run --gpus all -t -d -v /home/circleci/project:/mmaction -w /mmaction --name mmaction mmaction:gpu docker exec mmaction apt-get update + docker exec mmaction pip install "numpy==1.23" docker exec mmaction apt-get upgrade -y docker exec mmaction apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libturbojpeg pkg-config docker exec mmaction apt-get install -y libavdevice-dev libavfilter-dev libopus-dev libvpx-dev libsrtp2-dev libsndfile1 + - run: + name: Install PytorchVideo and timm + command: | + docker exec mmaction pip install timm + docker exec mmaction python -m pip install pytorchvideo - run: name: Install mmaction dependencies command: | @@ -126,21 +132,6 @@ jobs: docker exec mmaction pip install git+https://git@github.com/open-mmlab/mmdetection.git@dev-3.x docker exec mmaction pip install git+https://github.com/open-mmlab/mmclassification.git@dev-1.x docker exec mmaction pip install -r requirements.txt - - when: - condition: - equal: [ "1.8.1", << parameters.torch >> ] - steps: - - run: docker exec mmaction pip install timm - - when: - condition: - equal: [ "1.6.0", << parameters.torch >> ] - steps: - - run: docker exec mmaction pip install timm==0.6.7 - - when: - condition: - equal: [ "10.2", << parameters.cuda >> ] - steps: - - run: docker exec mmaction python -m pip install pytorchvideo - run: name: Build and install command: | @@ -159,7 +150,7 @@ workflows: branches: ignore: - dev-1.x - - 1.x + - main pr_stage_test: when: not: @@ -171,7 +162,7 @@ workflows: branches: ignore: - dev-1.x - - 1.x + - main - build_cpu: name: minimum_version_cpu torch: 1.6.0 @@ -195,7 +186,7 @@ workflows: torch: 1.8.1 # Use double quotation mark to explicitly specify its type # as string instead of number - cuda: "10.2" + cuda: "11.0" requires: - hold merge_stage_test: @@ -205,11 +196,12 @@ workflows: jobs: - build_cuda: name: minimum_version_gpu - torch: 1.6.0 + torch: 1.7.1 # Use double quotation mark to explicitly specify its type # as string instead of number - cuda: "10.1" + cuda: "11.0" filters: branches: only: - dev-1.x + - main diff --git a/mmaction/datasets/transforms/pose_transforms.py b/mmaction/datasets/transforms/pose_transforms.py index 76e09dacd8..0abb987551 100644 --- a/mmaction/datasets/transforms/pose_transforms.py +++ b/mmaction/datasets/transforms/pose_transforms.py @@ -1348,7 +1348,7 @@ def transform(self, results: Dict) -> Dict: else: inds = self._get_train_clips(num_frames, clip_len) inds = np.mod(inds, num_frames) - results[f'{modality}_inds'] = inds.astype(np.int) + results[f'{modality}_inds'] = inds.astype(np.int32) modalities.append(modality) results['clip_len'] = self.clip_len results['frame_interval'] = None