Remove cffi dependency as it doesn't look like we're using it

albanD · albanD · commit f8a3c16847f2 · 2023-01-20T20:47:38.000-05:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/docker/common/install_conda.sh b/.circleci/docker/common/install_conda.sh
@@ -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
diff --git a/.circleci/scripts/binary_ios_build.sh b/.circleci/scripts/binary_ios_build.sh
@@ -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))/../"}
 
diff --git a/.circleci/verbatim-sources/job-specs/job-specs-custom.yml b/.circleci/verbatim-sources/job-specs/job-specs-custom.yml
@@ -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}
diff --git a/.github/requirements-gha-cache.txt b/.github/requirements-gha-cache.txt
@@ -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
diff --git a/.github/requirements/conda-env-Linux-X64 b/.github/requirements/conda-env-Linux-X64
@@ -1,4 +1,3 @@
-cffi=1.15.1
 cmake=3.22.*
 mkl=2022.1.0
 mkl-include=2022.1.0
diff --git a/.github/requirements/conda-env-iOS b/.github/requirements/conda-env-iOS
@@ -1,5 +1,4 @@
 blas=1.0
-cffi=1.15.1
 cmake=3.22.1
 mkl=2022.1.0
 mkl-include=2022.1.0
diff --git a/.github/requirements/conda-env-macOS-ARM64 b/.github/requirements/conda-env-macOS-ARM64
@@ -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
diff --git a/.github/requirements/conda-env-macOS-X64 b/.github/requirements/conda-env-macOS-X64
@@ -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
diff --git a/.github/workflows/run_torchbench.yml b/.github/workflows/run_torchbench.yml
@@ -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
diff --git a/README.md b/README.md
@@ -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**
diff --git a/benchmarks/dynamo/Makefile b/benchmarks/dynamo/Makefile
@@ -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)
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,6 @@ requires = [
     "pyyaml",
     "setuptools",
     "cmake",
-    "cffi",
     "typing_extensions",
     "future",
     "six",
diff --git a/torch/utils/benchmark/examples/blas_compare_setup.py b/torch/utils/benchmark/examples/blas_compare_setup.py
@@ -22,7 +22,6 @@
 
 GENERIC_ENV_VARS = ("USE_CUDA=0", "USE_ROCM=0")
 BASE_PKG_DEPS = (
-    "cffi",
     "cmake",
     "hypothesis",
     "ninja",
diff --git a/torch/utils/benchmark/examples/prepare_e2e.sh b/torch/utils/benchmark/examples/prepare_e2e.sh
@@ -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
 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`# Install PyTorch conda deps, as per https://github.com/pytorch/pytorch README`
`78`		`- CONDA_COMMON_DEPS="astunparse pyyaml mkl=2022.0.1 mkl-include=2022.0.1 setuptools cffi six"`
	`78`	`+ CONDA_COMMON_DEPS="astunparse pyyaml mkl=2022.0.1 mkl-include=2022.0.1 setuptools six"`
`79`	`79`	`if [ "$ANACONDA_PYTHON_VERSION" = "3.10" ]; then`
`80`	`80`	`# Install llvm-8 as it is required to compile llvmlite-0.30.0 from source`
`81`	`81`	`conda_install numpy=1.21.2 ${CONDA_COMMON_DEPS} llvmdev=8.0.0`
Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@`
`577`	`577`	`$* \|\| (sleep 1 && $) \|\| (sleep 2 && $) \|\| (sleep 4 && $) \|\| (sleep 8 && $)`
`578`	`578`	`}`
`579`	`579`
`580`		`- retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake cffi requests typing_extensions --yes`
	`580`	`+ retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake requests typing_extensions --yes`
`581`	`581`
`582`	`582`	`# sync submodules`
`583`	`583`	`cd ${PROJ_ROOT}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cffi=1.15.1`
`2`	`1`	`cmake=3.22.*`
`3`	`2`	`mkl=2022.1.0`
`4`	`3`	`mkl-include=2022.1.0`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`blas=1.0`
`2`		`-cffi=1.15.1`
`3`	`2`	`cmake=3.22.1`
`4`	`3`	`mkl=2022.1.0`
`5`	`4`	`mkl-include=2022.1.0`