Skip to content
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.

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

aarch64 build fixes #258

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion Changes.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
8.0.0 alpha x (relative to 8.0.0 alpha 8)
-------------


- OpenShadingLanguage : Disabled `USE_BATCHED` on `aarch64`.
- Cycles : Disabled path guiding on `aarch64` pending OpenPGL update.
- Build : Added support for architecture-specific config overrides.
- OpenImageIO : Updated to version 2.5.9.0.
- Embree : Updated to version 4.3.1.

8.0.0 alpha 8 (relative to 8.0.0 alpha 7)
-------------
Expand Down
21 changes: 19 additions & 2 deletions Cycles/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
" -D CMAKE_PREFIX_PATH={buildDir}"
" -D CMAKE_BUILD_TYPE=Release"
" -D WITH_CYCLES_OPENIMAGEDENOISE=OFF"
" -D WITH_CYCLES_PATH_GUIDING=ON"
" -D WITH_CYCLES_PATH_GUIDING={pathGuiding}"
" -D WITH_CYCLES_CUDA_BINARIES=ON"
" -D WITH_CYCLES_DEVICE_CUDA=ON"
" -D WITH_CYCLES_DEVICE_HIP=OFF"
Expand All @@ -41,7 +41,24 @@

],

"manifest" : [
"variables" : {

"pathGuiding" : "ON",

},

# OpenPGL 0.5 doesn't support aarch64, 0.6 does, but has API breaks
"arch:aarch64" : {

"variables" : {
"pathGuiding" : "OFF",
},

"dependencies" : [ "Boost", "OpenJPEG", "OpenImageIO", "TBB", "Alembic", "Embree", "OpenColorIO", "OpenVDB", "OpenShadingLanguage", "OpenSubdiv", "LibWebP" ],

},

"manifest" : [

"cycles",

Expand Down
2 changes: 1 addition & 1 deletion Embree/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

"downloads" : [

"https://github.com/embree/embree/archive/v4.3.0.tar.gz"
"https://github.com/embree/embree/archive/v4.3.1.tar.gz"

],

Expand Down
2 changes: 1 addition & 1 deletion OpenImageIO/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

"downloads" : [

"https://github.com/OpenImageIO/oiio/archive/refs/tags/v2.5.8.0.tar.gz"
"https://github.com/OpenImageIO/oiio/archive/refs/tags/v2.5.9.0.tar.gz"

],

Expand Down
8 changes: 8 additions & 0 deletions OpenPGL/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,12 @@

],

# OpenPGL 0.5 doesn't support aarch64, 0.6 does, but has API breaks
# that aren't compatible with Cycles (currently the only consumer).
"arch:aarch64" : {

"enabled": False

}

}
10 changes: 9 additions & 1 deletion OpenShadingLanguage/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@
"useBatched" : "0",
}

}
},

"arch:aarch64" : {

"variables" : {
"useBatched" : "0",
}

},

}
5 changes: 4 additions & 1 deletion build.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import json
import os
import operator
import platform
import multiprocessing
import subprocess
import shutil
Expand Down Expand Up @@ -64,7 +65,8 @@
Configs may specify platform-specific overrides in a dictionary named
"platform:macos" or "platform:linux". Where a config setting is a dictionary,
overrides are merged in via `dict.update()`, otherwise they completely
replace the original value.
replace the original value. Architecture-specific overrides can be
provided with "arch:<arch>" e.g. "arch:aarch64".

### Variants

Expand Down Expand Up @@ -208,6 +210,7 @@ def __loadConfigs( variables, variants ) :
for variantProject, variant in variants.items() :
__applyConfigOverrides( config, "variant:{}:{}".format( variantProject, variant ) )
__applyConfigOverrides( config, "platform:macos" if sys.platform == "darwin" else "platform:linux" )
__applyConfigOverrides( config, "arch:{}".format( platform.machine() ) )
if config.get( "enabled", True ) :
configs[project] = config

Expand Down