Skip to content

Commit d4caf74

Browse files
committed
WIP: clean up deps/requirements
1 parent 956777b commit d4caf74

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

build/Utils.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ function(resolve_buck2)
194194
else()
195195
# Wrong buck version used. Stop here to ensure that the user sees
196196
# the error.
197+
message(WARNING ${resolve_buck2_error})
197198
message(FATAL_ERROR "Failed to resolve buck2.")
198-
message(FATAL_ERROR ${resolve_buck2_error})
199199
endif()
200-
endfunction()
200+
endfunction()

install_requirements.sh

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@
55
# This source code is licensed under the BSD-style license found in the
66
# LICENSE file in the root directory of this source tree.
77

8-
# Install required python dependencies for developing
9-
# Dependencies are defined in .pyproject.toml
10-
if [[ -z $BUCK ]];
11-
then
12-
BUCK=buck2
13-
fi
14-
15-
if [[ -z $PYTHON_EXECUTABLE ]];
16-
then
17-
PYTHON_EXECUTABLE=python3
18-
fi
19-
208
# Parse options.
219
EXECUTORCH_BUILD_PYBIND=OFF
2210
CMAKE_ARGS=""
@@ -41,6 +29,7 @@ for arg in "$@"; do
4129
esac
4230
done
4331

32+
4433
# Install pytorch dependencies
4534
#
4635
# Note:
@@ -69,11 +58,15 @@ pip install --force-reinstall --pre transformers==${TRANSFORMERS_VERSION}
6958
TORCHSR_VERSION=1.0.4
7059
pip install --pre torchsr==${TORCHSR_VERSION}
7160

72-
# Install ExecuTorch after dependencies are installed.
61+
62+
#
63+
# Install executorch pip package. This also makes `flatc` available on the path.
64+
#
65+
66+
# Deps needed by pip install and cmake.
67+
# TODO(dbort): Remove tomli once min python version is 3.11.
68+
pip install zstd tomli setuptools wheel
69+
7370
EXECUTORCH_BUILD_PYBIND="$EXECUTORCH_BUILD_PYBIND" \
7471
CMAKE_ARGS="$CMAKE_ARGS" \
75-
CMAKE_BUILD_PARALLEL_LEVEL=9 \
7672
pip install . --no-build-isolation -v
77-
78-
# Install flatc dependency
79-
bash build/install_flatc.sh

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ dependencies=[
2020
"ruamel.yaml",
2121
"sympy",
2222
"tabulate",
23-
"tomli",
24-
"zstd",
2523
]
2624

2725
# Tell setuptools to generate commandline wrappers for tools that we install

0 commit comments

Comments
 (0)