Remove cffi dependency as it doesn't look like we're using it (#92738)

Maybe this will go horribly wrong in CI but works fine without it locally!

Pull Request resolved: https://github.com/pytorch/pytorch/pull/92738
Approved by: https://github.com/kit1980, https://github.com/seemethere
This commit is contained in:
albanD 2023-01-22 15:03:49 +00:00 committed by PyTorch MergeBot
parent 0d9de46d9c
commit 2f6a975f25
15 changed files with 8 additions and 15 deletions

2
.circleci/config.yml generated
View File

@ -1052,7 +1052,7 @@ jobs:
$* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
}
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests typing_extensions --yes
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake requests typing_extensions --yes
# sync submodules
cd ${PROJ_ROOT}

View File

@ -75,7 +75,7 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
}
# Install PyTorch conda deps, as per https://github.com/pytorch/pytorch README
CONDA_COMMON_DEPS="astunparse pyyaml mkl=2022.0.1 mkl-include=2022.0.1 setuptools cffi six"
CONDA_COMMON_DEPS="astunparse pyyaml mkl=2022.0.1 mkl-include=2022.0.1 setuptools six"
if [ "$ANACONDA_PYTHON_VERSION" = "3.10" ]; then
# Install llvm-8 as it is required to compile llvmlite-0.30.0 from source
conda_install numpy=1.21.2 ${CONDA_COMMON_DEPS} llvmdev=8.0.0

View File

@ -15,7 +15,7 @@ export PATH="~/anaconda/bin:${PATH}"
source ~/anaconda/bin/activate
# Install dependencies
conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests typing_extensions --yes
conda install numpy ninja pyyaml mkl mkl-include setuptools cmake requests typing_extensions --yes
conda install -c conda-forge valgrind --yes
export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"}

View File

@ -577,7 +577,7 @@
$* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
}
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests typing_extensions --yes
retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake requests typing_extensions --yes
# sync submodules
cd ${PROJ_ROOT}

View File

@ -6,7 +6,6 @@
# functorch/docs/requirements.txt
# .circleci/docker/requirements-ci.txt
boto3==1.19.12
cffi==1.15.0
dataclasses==0.6
jinja2==3.0.1
lintrunner==0.9.2

View File

@ -1,4 +1,3 @@
cffi=1.15.1
cmake=3.22.*
mkl=2022.1.0
mkl-include=2022.1.0

View File

@ -1,5 +1,4 @@
blas=1.0
cffi=1.15.1
cmake=3.22.1
mkl=2022.1.0
mkl-include=2022.1.0

View File

@ -2,7 +2,6 @@ numpy=1.22.3
pyyaml=6.0
setuptools=61.2.0
cmake=3.22.*
cffi=1.15.1
typing_extensions=4.3.0
dataclasses=0.8
pip=22.2.2

View File

@ -4,7 +4,6 @@ numpy=1.18.5
pyyaml=5.3
setuptools=46.0.0
cmake=3.22.*
cffi=1.15.1
typing_extensions=4.3.0
dataclasses=0.8
pip=22.2.2

View File

@ -40,7 +40,7 @@ jobs:
. "${SETUP_SCRIPT}"
conda activate pr-ci
conda install -y numpy="${NUMPY_VERSION}" requests ninja pyyaml mkl mkl-include \
setuptools cmake=3.22.* cffi typing_extensions boto3 \
setuptools cmake=3.22.* typing_extensions boto3 \
future six dataclasses pillow pytest tabulate gitpython git-lfs tqdm psutil
pip install --pre torch torchvision torchtext -f https://download.pytorch.org/whl/nightly/cu116/torch_nightly.html
- name: Setup TorchBench branch

View File

@ -184,7 +184,7 @@ Other potentially useful environment variables may be found in `setup.py`.
**Common**
```bash
conda install astunparse numpy ninja pyyaml setuptools cmake cffi typing_extensions six requests dataclasses
conda install astunparse numpy ninja pyyaml setuptools cmake typing_extensions six requests dataclasses
```
**On Linux**

View File

@ -28,7 +28,7 @@ build-deps: clone-deps
# conda create --name torchdynamo -y python=3.8
# conda activate torchdynamo
conda install -y astunparse numpy scipy ninja pyyaml mkl mkl-include setuptools cmake \
cffi typing_extensions future six requests dataclasses protobuf numba cython scikit-learn
typing_extensions future six requests dataclasses protobuf numba cython scikit-learn
conda install -y -c pytorch magma-cuda116
conda install -y -c conda-forge librosa
(cd ../../../torchvision && python setup.py clean && python setup.py develop)

View File

@ -8,7 +8,6 @@ requires = [
"pyyaml",
"setuptools",
"cmake",
"cffi",
"typing_extensions",
"future",
"six",

View File

@ -22,7 +22,6 @@ EIGEN = "eigen"
GENERIC_ENV_VARS = ("USE_CUDA=0", "USE_ROCM=0")
BASE_PKG_DEPS = (
"cffi",
"cmake",
"hypothesis",
"ninja",

View File

@ -17,7 +17,7 @@ make_clean_env(){
conda create -yn "${ENV_NAME}" python=3
source activate "${ENV_NAME}"
conda install -y numpy ninja pyyaml mkl mkl-include setuptools cmake cffi hypothesis
conda install -y numpy ninja pyyaml mkl mkl-include setuptools cmake hypothesis
conda install -y -c pytorch magma-cuda102
conda deactivate
}