You need to sign in or sign up before continuing.
Unverified Commit 81777d12 authored by lizz's avatar lizz Committed by GitHub
Browse files

Use more cpus in building (#1046)



* Use more cpus in building
Signed-off-by: default avatarlizz <lizz@sensetime.com>

* Add psutil to requirements
Signed-off-by: default avatarlizz <lizz@sensetime.com>

* fix
Signed-off-by: default avatarlizz <lizz@sensetime.com>

* fix
Signed-off-by: default avatarlizz <lizz@sensetime.com>

* Hope faster
Signed-off-by: default avatarlizz <lizz@sensetime.com>

* fix macos
Signed-off-by: default avatarlizz <lizz@sensetime.com>
parent 9679ce8c
...@@ -41,6 +41,8 @@ jobs: ...@@ -41,6 +41,8 @@ jobs:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Install system dependencies - name: Install system dependencies
run: sudo apt-get update && sudo apt-get install -y ffmpeg libturbojpeg run: sudo apt-get update && sudo apt-get install -y ffmpeg libturbojpeg
- name: Install utils
run: pip install psutil
- name: Build and install - name: Build and install
run: rm -rf .eggs && pip install -e . run: rm -rf .eggs && pip install -e .
- name: Validate the installation - name: Validate the installation
...@@ -73,6 +75,8 @@ jobs: ...@@ -73,6 +75,8 @@ jobs:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Install system dependencies - name: Install system dependencies
run: sudo apt-get update && sudo apt-get install -y ffmpeg libturbojpeg run: sudo apt-get update && sudo apt-get install -y ffmpeg libturbojpeg
- name: Install utils
run: pip install psutil
- name: Install PyTorch - name: Install PyTorch
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
- name: Build and install - name: Build and install
...@@ -113,6 +117,8 @@ jobs: ...@@ -113,6 +117,8 @@ jobs:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Install system dependencies - name: Install system dependencies
run: sudo apt-get update && sudo apt-get install -y ffmpeg libturbojpeg run: sudo apt-get update && sudo apt-get install -y ffmpeg libturbojpeg
- name: Install utils
run: pip install psutil
- name: Install Pillow - name: Install Pillow
run: pip install Pillow==6.2.2 run: pip install Pillow==6.2.2
if: ${{matrix.torchvision == '0.4.2'}} if: ${{matrix.torchvision == '0.4.2'}}
...@@ -181,6 +187,8 @@ jobs: ...@@ -181,6 +187,8 @@ jobs:
export LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${CUDA_HOME}/include:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${CUDA_HOME}/include:${LD_LIBRARY_PATH}
export PATH=${CUDA_HOME}/bin:${PATH} export PATH=${CUDA_HOME}/bin:${PATH}
sudo apt-get install -y ninja-build sudo apt-get install -y ninja-build
- name: Install utils
run: pip install psutil
- name: Install Pillow - name: Install Pillow
run: pip install Pillow==6.2.2 run: pip install Pillow==6.2.2
if: ${{matrix.torchvision == '0.4.2'}} if: ${{matrix.torchvision == '0.4.2'}}
...@@ -305,6 +313,8 @@ jobs: ...@@ -305,6 +313,8 @@ jobs:
python-version: 3.7 python-version: 3.7
- name: Install system dependencies - name: Install system dependencies
run: brew install ffmpeg jpeg-turbo run: brew install ffmpeg jpeg-turbo
- name: Install utils
run: pip install psutil
- name: Install Pillow - name: Install Pillow
run: pip install Pillow==6.2.2 run: pip install Pillow==6.2.2
if: ${{matrix.torchvision == '0.4.2'}} if: ${{matrix.torchvision == '0.4.2'}}
......
...@@ -214,7 +214,14 @@ def get_extensions(): ...@@ -214,7 +214,14 @@ def get_extensions():
from torch.utils.cpp_extension import CppExtension, CUDAExtension from torch.utils.cpp_extension import CppExtension, CUDAExtension
# prevent ninja from using too many resources # prevent ninja from using too many resources
os.environ.setdefault('MAX_JOBS', '4') try:
import psutil
num_cpu = len(psutil.Process().cpu_affinity())
cpu_use = max(4, num_cpu - 1)
except (ModuleNotFoundError, AttributeError):
cpu_use = 4
os.environ.setdefault('MAX_JOBS', str(cpu_use))
define_macros = [] define_macros = []
extra_compile_args = {'cxx': []} extra_compile_args = {'cxx': []}
include_dirs = [] include_dirs = []
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment