Skip to content

Feature/fixed build macos #4414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 10, 2022
Merged

Feature/fixed build macos #4414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
68c4af1
Updated dependency versions and FFMpeg installation instructions in o…
evekeen Mar 3, 2022
89a8532
Fixed opencv version to align with one from the datumaro dependencies
evekeen Mar 3, 2022
add6415
Added tensor-flow instructions for Mac Apple Silicon
evekeen Mar 3, 2022
6d4872b
More macos notes
evekeen Mar 4, 2022
2c807fc
Updated changelog
evekeen Mar 4, 2022
c5c66b6
Fixed formatting
evekeen Mar 4, 2022
6fca699
Update CHANGELOG.md
Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- API versioning scheme: using accept header versioning instead of namespace versioning (<https://github.com/openvinotoolkit/cvat/pull/4239>)
- Replaced 'django_sendfile' with 'django_sendfile2' (<https://github.com/openvinotoolkit/cvat/pull/4267>)
- Use drf-spectacular instead of drf-yasg for swagger documentation (<https://github.com/openvinotoolkit/cvat/pull/4210>)
- Update development-environment manual to work under MacOS, supported Mac with Apple Silicon (<https://github.com/openvinotoolkit/cvat/pull/4414>)

### Deprecated
- Job field "status" is not used in UI anymore, but it has not been removed from the database yet (<https://github.com/openvinotoolkit/cvat/pull/3788>)
Expand Down
8 changes: 4 additions & 4 deletions cvat/requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ drf-spectacular==0.21.2
Shapely==1.7.1
pdf2image==1.14.0
django-rest-auth[with_social]==0.9.5
opencv-python-headless==4.4.0.42
h5py==2.10.0
opencv-python-headless==4.5.5.62
h5py==3.6.0
django-cors-headers==3.5.0
furl==2.1.0
av==8.0.2 --no-binary=av
tensorflow==2.8.0 # Optional requirement of Datumaro
tensorflow==2.8.0 # Optional requirement of Datumaro. Use tensorflow-macos==2.8.0 for Mac M1
# The package is used by pyunpack as a command line tool to support multiple
# archives. Don't use as a python module because it has GPL license.
patool==1.12
diskcache==5.0.2
open3d==0.11.2
open3d==0.14.1
boto3==1.17.61
azure-storage-blob==12.8.1
google-cloud-storage==1.42.0
Expand Down
20 changes: 19 additions & 1 deletion site/content/en/docs/contributing/development-environment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ description: 'Installing a development environment for different operating syste
MacOS 10.15

```bash
brew install git python pyenv redis curl openssl node
brew install git python pyenv redis curl openssl node sqlite3 geos
```

- Install Chrome
Expand All @@ -42,6 +42,10 @@ description: 'Installing a development environment for different operating syste
- [licenser](https://marketplace.visualstudio.com/items?itemName=ymotongpoo.licenser)
- [Trailing Spaces](https://marketplace.visualstudio.com/items?itemName=shardulm94.trailing-spaces)

- Make sure to use Python 3.9.0 or higher
```
python3 --version
```

- Install CVAT on your local host:

Expand All @@ -61,6 +65,20 @@ description: 'Installing a development environment for different operating syste
> If you have any problems with installing dependencies from
> `cvat/requirements/*.txt`, you may need to reinstall your system python
> In some cases after system update it can be configured incorrectly and cannot compile some native modules
>
> Make sure Homebrew lib path is in `DYLD_LIBRARY_PATH`. For Apple Silicon: `export DYLD_LIBRARY_PATH=/opt/homebrew/lib:$DYLD_LIBRARY_PATH`
>
> Homebrew will install FFMpeg 5.0 by default, which does not work, so you should install 4.X.
> You can install older 4.X FFMpeg using Homebrew like that:
> ```
> cd "$(brew --repo homebrew/core)"
> git checkout addd616edc9134f057e33694c420f4900be59db8
> brew unlink ffmpeg
> HOMEBREW_NO_AUTO_UPDATE=1 brew install ffmpeg
> git checkout master
> ```
> On Mac with Apple Silicon (M1) in order to install TensorFlow you will have to edit `cvat/requirements/base.txt`.
> Change `tensorflow` to `tensorflow-macos`

- Create a super user for CVAT:

Expand Down