Skip to content

Commit

Permalink
Merge branch 'master' into oiio_cmake_config
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Dolan <[email protected]>
  • Loading branch information
michdolan committed Jul 13, 2020
2 parents 94cfe85 + b843e98 commit 14d8772
Show file tree
Hide file tree
Showing 123 changed files with 10,221 additions and 2,802 deletions.
49 changes: 46 additions & 3 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
cxx-compiler: g++
Expand All @@ -76,6 +78,8 @@ jobs:
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
cxx-compiler: g++
Expand All @@ -87,6 +91,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 14
cxx-compiler: g++
Expand All @@ -98,6 +104,8 @@ jobs:
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'OFF'
cxx-standard: 11
cxx-compiler: g++
Expand All @@ -112,6 +120,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
cxx-compiler: g++
Expand All @@ -126,6 +136,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
cxx-compiler: clang++
Expand All @@ -137,6 +149,8 @@ jobs:
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
build-gpu: 'OFF'
build-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
cxx-compiler: clang++
Expand All @@ -148,6 +162,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 14
cxx-compiler: clang++
Expand All @@ -159,6 +175,8 @@ jobs:
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'OFF'
cxx-standard: 11
cxx-compiler: clang++
Expand All @@ -173,6 +191,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
cxx-compiler: clang++
Expand Down Expand Up @@ -202,7 +222,8 @@ jobs:
-DCMAKE_CXX_STANDARD=${{ matrix.cxx-standard }} \
-DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-DOCIO_BUILD_DOCS=${{ matrix.build-docs }} \
-DOCIO_BUILD_GPU_TESTS=OFF \
-DOCIO_BUILD_GPU_TESTS=${{ matrix.build-gpu }} \
-DOCIO_USE_HEADLESS=${{ matrix.use-headless }} \
-DOCIO_USE_SSE=${{ matrix.use-sse }} \
-DOCIO_INSTALL_EXT_PACKAGES=ALL \
-DOCIO_WARNING_AS_ERROR=ON \
Expand Down Expand Up @@ -242,6 +263,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
python-version: 3.7
Expand All @@ -250,6 +273,8 @@ jobs:
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
python-version: 3.7
Expand All @@ -258,6 +283,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 14
python-version: 3.7
Expand All @@ -266,6 +293,8 @@ jobs:
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'OFF'
cxx-standard: 11
python-version: 3.7
Expand All @@ -274,6 +303,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
python-version: 2.7
Expand All @@ -296,7 +327,8 @@ jobs:
-DCMAKE_CXX_STANDARD=${{ matrix.cxx-standard }} \
-DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-DOCIO_BUILD_DOCS=${{ matrix.build-docs }} \
-DOCIO_BUILD_GPU_TESTS=OFF \
-DOCIO_BUILD_GPU_TESTS=${{ matrix.build-gpu }} \
-DOCIO_USE_HEADLESS=${{ matrix.use-headless }} \
-DOCIO_USE_SSE=${{ matrix.use-sse }} \
-DOCIO_INSTALL_EXT_PACKAGES=ALL \
-DOCIO_WARNING_AS_ERROR=ON \
Expand Down Expand Up @@ -338,6 +370,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
python-version: 3.7
Expand All @@ -346,6 +380,8 @@ jobs:
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
python-version: 3.7
Expand All @@ -354,6 +390,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 14
python-version: 3.7
Expand All @@ -362,6 +400,8 @@ jobs:
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'OFF'
cxx-standard: 11
python-version: 3.7
Expand All @@ -370,6 +410,8 @@ jobs:
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
build-gpu: 'OFF'
use-headless: 'OFF'
use-sse: 'ON'
cxx-standard: 11
python-version: 2.7
Expand All @@ -394,7 +436,8 @@ jobs:
-DCMAKE_GENERATOR_PLATFORM=x64 \
-DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-DOCIO_BUILD_DOCS=${{ matrix.build-docs }} \
-DOCIO_BUILD_GPU_TESTS=OFF \
-DOCIO_BUILD_GPU_TESTS=${{ matrix.build-gpu }} \
-DOCIO_USE_HEADLESS=${{ matrix.use-headless }} \
-DOCIO_USE_SSE=${{ matrix.use-sse }} \
-DOCIO_INSTALL_EXT_PACKAGES=ALL \
-DOCIO_WARNING_AS_ERROR=ON \
Expand Down
53 changes: 45 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ option(OCIO_BUILD_NUKE "Specify whether to build nuke plugins" OFF)
option(OCIO_BUILD_DOCS "Specify whether to build documentation" OFF)
option(OCIO_BUILD_TESTS "Specify whether to build unittests" ON)
option(OCIO_BUILD_GPU_TESTS "Specify whether to build gpu unittests" ON)
option(OCIO_USE_HEADLESS "Specify whether the GPU rendering is headless" OFF)

option(OCIO_BUILD_PYTHON "Specify whether to build python bindings" ON)
option(OCIO_BUILD_JAVA "Specify whether to build java bindings" OFF)
Expand All @@ -88,14 +89,24 @@ include(PackageUtils)

if(OCIO_BUILD_GPU_TESTS OR OCIO_BUILD_APPS)
set(OCIO_GL_ENABLED ON)
find_package(OpenGL)
if(NOT OpenGL_FOUND)

find_package(OpenGL COMPONENTS OpenGL)
if(NOT OpenGL_OpenGL_FOUND AND NOT OPENGL_GLU_FOUND)
package_root_message(OpenGL)
message(WARNING "OpenGL not found; GPU rendering disabled")
set(OCIO_GL_ENABLED OFF)
endif()

if(NOT APPLE)
endif()

# OpenGL_egl_Library is defined iff GLVND is supported (CMake 10+).
if(OPENGL_egl_LIBRARY)
message(STATUS "GLVND supported")
set(OCIO_USE_GLVND ON)
else()
message(STATUS "GLVND not supported; legacy OpenGL libraries used")
set(OCIO_USE_GLVND OFF)
endif()

if(NOT APPLE)
find_package(GLEW)
if(NOT GLEW_FOUND)
package_root_message(GLEW)
Expand All @@ -107,10 +118,36 @@ if(OCIO_BUILD_GPU_TESTS OR OCIO_BUILD_APPS)
if(NOT GLUT_FOUND)
package_root_message(GLUT)
set(OCIO_GL_ENABLED OFF)
endif()

endif()

set(OCIO_EGL_HEADLESS OFF)
if(${OCIO_USE_HEADLESS})
if(CMAKE_SYSTEM_NAME STREQUAL Linux)
if(NOT ${OCIO_USE_GLVND})
message(STATUS "Can't find EGL without GLVND support; can't render headlessly")
set(OCIO_USE_HEADLESS OFF)
set(OCIO_EGL_HEADLESS OFF)
else()
set(OCIO_EGL_HEADLESS ON)
find_package(OpenGL COMPONENTS EGL)
if(NOT OpenGL_EGL_FOUND)
message(WARNING "EGL component missing; can't render headlessly")
set(OCIO_USE_HEADLESS OFF)
set(OCIO_EGL_HEADLESS OFF)
else()
add_compile_definitions(OCIO_HEADLESS_ENABLED)
endif()
endif()
else()
message(WARNING "OS system is not Linux; can't render headlessly")
set(OCIO_EGL_HEADLESS OFF)
endif()
endif()
endif()

message(STATUS "GL enabled " ${OCIO_GL_ENABLED})
message(STATUS "EGL enabled " ${OCIO_EGL_HEADLESS})

###############################################################################
# Optimization / internal linking preferences

Expand Down
90 changes: 90 additions & 0 deletions docs/tsc/meetings/2020-06-29.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenColorIO Project. -->

June 29, 2020

Host: Michael Dolan

Rotating Secretary: Michael Dolan

Attendees:
* [X] Mark Boorer (_TSC_) - Industrial Light & Magic
* [X] Mei Chu (_TSC_) - Sony Pictures Imageworks
* [X] Sean Cooper (_TSC ACES TAC Rep_) - DNEG
* [X] Michael Dolan (_TSC Chair_) - Epic Games
* [X] Patrick Hodoul (_TSC_) - Autodesk
* [ ] John Mertic - Academy Software Foundation / Linux Foundation
* [X] Carol Payne (_TSC_) - Netflix
* [X] Mark Titchener (_TSC_) - Foundry
* [ ] Carl Rand (_TSC_) - Weta Digital
* [X] Doug Walker (_TSC Chief Architect_) - Autodesk
* [X] Kevin Wheatley (_TSC_) - Framestore
* [X] Bernard Lefebvre - Autodesk
* [X] Troy Sobotka

Apologies:
NONE

# **OCIO TSC Meeting Notes**

* Open source day, DigiPro, SIGGRAPH plans:
- Michael: Plans not final yet for Open Source Day, but between these
events, how do we want to announce and present the OCIO v2 release.
- Both DigiPro and OSD are 25 minute presentations.
- Patrick: These are not enough time for all of v2.
- Doug: Main thing at SIGGRAPH is to get the word out, get it on people's
radar. SIGGRAPH will be a busy time with many zoom meetings over those
weeks. We'll probably want to do something longer after.
- Patrick: Would the audience be the same as with the v2 working group?
- Doug: Would be bigger group. We do want to have a presentation more for
developers that want to upgrade their app to use v2.
- Patrick: How do we make sure we have these people? How do we get more
people who are less active in other discussions.
- Carol: If we have a presentation at SIGGRAPH, part of that could be to
bring up when questions can be discussed at a later, less formal, event.
- Michael: Could we do the longer meeting as a Bof? To also leverage the
SIGGRAPH schedule?
- Sean: Will be good to have something on the schedule. Get the initial
discussion, updates, etc. to the general audience, and invite them to
something specific afterwords. May be able to put out word at the VFX
Reference Platform discussion.
- Carol: Can the DigiPro talk be done twice? Once at OSD, once at DigiPro?
- Doug: OSD might require more practical project related topics to cover.
We have a lot of material to cover. Could talk at OSD about case study
of OCIO joining ASWF.
- Patrick: ASWF will provide a forum, but we can decide how to use that
time and what content to cover.
- DigiPro to focus more on technical part of paper; OSD to focus more on
admin aspects of project, and as an invite to longer BoF session; BoF
to provide longer update and discussion forum. The BoF could also be
replaced by a later independent event if needed.

* Summer vacations:
- Patrick out second half of July.
- Michael out next week.

* OpenColorIO-Config-ACES meeting tomorrow:
- Continue discussion on initial work to design and build the config. 4pm
EST, 1pm PST.

* Pending PRs:
- Close to feature complete. Please have a look to keep reviews moving.
- Sean: PRs with multiple contributors are getting complicated. Not now,
but we may want to explore using shared feature branches in main repo for
collaboration. Topic for future discussion.
- Patrick: Student actively working on headless rendering support. Making
great progress, but currently encountering CI failures. Headed in the
right direction.
- Mark: Making progress on OpenColorMath. Currently working on the JIT
evaluator.

* Slack #helpdesk channel:
- Sean: Added a new #helpdesk channel to Slack to help with general
questions. With self-signup being active that will be a good place to
manage those discussions.

* V2 Working Group Discussion:
- Kevin: Looks like last v2 update got cut short based on slides. Anything
more to discuss?
- Doug: Will set up another meeting in near future. More to discuss around
caching and context variables.
Loading

0 comments on commit 14d8772

Please sign in to comment.