"...text-generation-inference.git" did not exist on "d18ed5cfc5f404dd7e8c1d719e8293e713c1fb4c"
Commit 601acce1 authored by moto's avatar moto Committed by Facebook GitHub Bot
Browse files

Build ffmpeg-features on macOS wheel binary dist (#2122)

Summary:
This commit enable ffmpeg-feature build on wheel-based binary distribution on macOS.

For macOS, since the underlying Python env is Conda, it installs `ffmpeg` from conda.

Depends on https://github.com/pytorch/audio/issues/1873

Pull Request resolved: https://github.com/pytorch/audio/pull/2122

Reviewed By: carolineechen, nateanl

Differential Revision: D33409113

Pulled By: mthrok

fbshipit-source-id: a73839087548010353422109b33e89e262c12a57
parent 832f055a
...@@ -204,6 +204,8 @@ jobs: ...@@ -204,6 +204,8 @@ jobs:
sh conda.sh -b sh conda.sh -b
source $HOME/miniconda3/bin/activate source $HOME/miniconda3/bin/activate
packaging/build_wheel.sh packaging/build_wheel.sh
environment:
BUILD_FFMPEG: true
- store_artifacts: - store_artifacts:
path: dist path: dist
- persist_to_workspace: - persist_to_workspace:
......
...@@ -204,6 +204,8 @@ jobs: ...@@ -204,6 +204,8 @@ jobs:
sh conda.sh -b sh conda.sh -b
source $HOME/miniconda3/bin/activate source $HOME/miniconda3/bin/activate
packaging/build_wheel.sh packaging/build_wheel.sh
environment:
BUILD_FFMPEG: true
- store_artifacts: - store_artifacts:
path: dist path: dist
- persist_to_workspace: - persist_to_workspace:
......
...@@ -183,7 +183,7 @@ setup_wheel_python() { ...@@ -183,7 +183,7 @@ setup_wheel_python() {
conda create -yn "env$PYTHON_VERSION" python="$PYTHON_VERSION" conda create -yn "env$PYTHON_VERSION" python="$PYTHON_VERSION"
conda activate "env$PYTHON_VERSION" conda activate "env$PYTHON_VERSION"
if [[ "$(uname)" == Darwin ]]; then if [[ "$(uname)" == Darwin ]]; then
conda install --quiet -y pkg-config conda install --quiet -y pkg-config "ffmpeg>=4.1"
fi fi
else else
case "$PYTHON_VERSION" in case "$PYTHON_VERSION" in
......
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