diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dcbd4a..4591d01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,13 @@ Version History --------------- -### Changes in v2.3.0: +### Changes in v2.4.0: - Significant improvements have been made to loading performance in the MPI Offload device. Applications which make large numbers of API calls or create many smaller geometries or volumes should see substantial load time improvements. +- Strided data arrays are compacted on the app rank before sending ### Changes in v2.2.0: diff --git a/CMakeLists.txt b/CMakeLists.txt index e193bb0..ef07c9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -project(ospray_module_mpi VERSION 2.3.0 LANGUAGES C CXX) +project(ospray_module_mpi VERSION 2.4.0 LANGUAGES C CXX) configure_file( ${CMAKE_SOURCE_DIR}/ospray/version.h.in diff --git a/README.md b/README.md index 209005d..9cfccb6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ OSPRay MPI Module ================= -This is release v2.2.0 of IntelĀ® OSPRay's MPI Module. For changes and +This is release v2.4.0 of IntelĀ® OSPRay's MPI Module. For changes and new features see the [changelog](CHANGELOG.md). Visit http://www.ospray.org for more information. diff --git a/common/Collectives.cpp b/common/Collectives.cpp index 06d6ade..6f74706 100644 --- a/common/Collectives.cpp +++ b/common/Collectives.cpp @@ -1,4 +1,4 @@ -// Copyright 2016-2019 Intel Corporation +// Copyright 2016-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "Collectives.h" diff --git a/common/Collectives.h b/common/Collectives.h index f145ad1..af4b5ec 100644 --- a/common/Collectives.h +++ b/common/Collectives.h @@ -1,4 +1,4 @@ -// Copyright 2016-2019 Intel Corporation +// Copyright 2016-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/common/MPICommon.cpp b/common/MPICommon.cpp index bb41610..900e8ba 100644 --- a/common/MPICommon.cpp +++ b/common/MPICommon.cpp @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "MPICommon.h" diff --git a/common/ObjectHandle.cpp b/common/ObjectHandle.cpp index 9ce80a7..b865a75 100644 --- a/common/ObjectHandle.cpp +++ b/common/ObjectHandle.cpp @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "ObjectHandle.h" diff --git a/common/maml/Context.cpp b/common/maml/Context.cpp index 5fe9eb0..ebf6ff1 100644 --- a/common/maml/Context.cpp +++ b/common/maml/Context.cpp @@ -1,4 +1,4 @@ -// Copyright 2016-2019 Intel Corporation +// Copyright 2016-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "Context.h" diff --git a/common/maml/Context.h b/common/maml/Context.h index f9d23c3..21d20fe 100644 --- a/common/maml/Context.h +++ b/common/maml/Context.h @@ -1,4 +1,4 @@ -// Copyright 2016-2019 Intel Corporation +// Copyright 2016-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/common/maml/maml.cpp b/common/maml/maml.cpp index 1b73fe3..dcfb15c 100644 --- a/common/maml/maml.cpp +++ b/common/maml/maml.cpp @@ -1,4 +1,4 @@ -// Copyright 2016-2019 Intel Corporation +// Copyright 2016-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "maml.h" diff --git a/ospray/common/DistributedWorld.h b/ospray/common/DistributedWorld.h index ad96a7f..b8cd019 100644 --- a/ospray/common/DistributedWorld.h +++ b/ospray/common/DistributedWorld.h @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/ospray/common/DistributedWorld.ispc b/ospray/common/DistributedWorld.ispc index 91b6de2..b293522 100644 --- a/ospray/common/DistributedWorld.ispc +++ b/ospray/common/DistributedWorld.ispc @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "DistributedWorld.ih" @@ -7,23 +7,7 @@ export void *uniform DistributedWorld_create(void *uniform cppE) { DistributedWorld *uniform world = uniform new DistributedWorld; - - // TODO: this should be done in the World_Constructor and called here - world->super.cppEquivalent = cppE; - world->super.geometriesInst = NULL; - world->super.numGeometriesInst = 0; - world->super.volumesInst = NULL; - world->super.numVolumesInst = 0; - world->super.clippersInst = NULL; - world->super.numClippersInst = 0; - - world->super.embreeSceneHandleGeometries = NULL; - world->super.embreeSceneHandleVolumes = NULL; - world->super.embreeSceneHandleClippers = NULL; - - world->super.numInvertedClippers = 0; - world->super.scivisData.lights = NULL; - + World_Constructor(&world->super, cppE); return (void *uniform)world; } diff --git a/ospray/common/Messaging.cpp b/ospray/common/Messaging.cpp index 13df156..b974e02 100644 --- a/ospray/common/Messaging.cpp +++ b/ospray/common/Messaging.cpp @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "Messaging.h" diff --git a/ospray/fb/TileOperation.cpp b/ospray/fb/TileOperation.cpp index 2a9a880..76ccdd3 100644 --- a/ospray/fb/TileOperation.cpp +++ b/ospray/fb/TileOperation.cpp @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "TileOperation.h" diff --git a/ospray/render/DistributedLoadBalancer.h b/ospray/render/DistributedLoadBalancer.h index b0bae65..4df77eb 100644 --- a/ospray/render/DistributedLoadBalancer.h +++ b/ospray/render/DistributedLoadBalancer.h @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/ospray/render/WriteMultipleTileOperation.cpp b/ospray/render/WriteMultipleTileOperation.cpp index 0e36ded..c89b3b6 100644 --- a/ospray/render/WriteMultipleTileOperation.cpp +++ b/ospray/render/WriteMultipleTileOperation.cpp @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "WriteMultipleTileOperation.h" diff --git a/ospray/render/WriteMultipleTileOperation.h b/ospray/render/WriteMultipleTileOperation.h index b255f73..fd4fb14 100644 --- a/ospray/render/WriteMultipleTileOperation.h +++ b/ospray/render/WriteMultipleTileOperation.h @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #pragma once diff --git a/ospray/render/distributed/AlphaCompositeTileOperation.cpp b/ospray/render/distributed/AlphaCompositeTileOperation.cpp index 810e056..ef3e918 100644 --- a/ospray/render/distributed/AlphaCompositeTileOperation.cpp +++ b/ospray/render/distributed/AlphaCompositeTileOperation.cpp @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "AlphaCompositeTileOperation.h" diff --git a/ospray/render/distributed/DistributedRaycast.ispc b/ospray/render/distributed/DistributedRaycast.ispc index 132348c..4320a71 100644 --- a/ospray/render/distributed/DistributedRaycast.ispc +++ b/ospray/render/distributed/DistributedRaycast.ispc @@ -57,7 +57,7 @@ vec4f DRR_integrateVolumeInterval(const ScreenSample &sample, TransferFunction *uniform tf = vm->transferFunction; VKLIntervalIterator intervalIterator = - vklInitIntervalIteratorV(volume->vklVolume, + vklInitIntervalIteratorV(volume->vklSampler, (varying vkl_vec3f *)&transformedRay.org, (varying vkl_vec3f *)&transformedRay.dir, (varying vkl_range1f *)&interval.interval, diff --git a/ospray/render/distributed/DistributedRenderer.cpp b/ospray/render/distributed/DistributedRenderer.cpp index 9e902ca..17f6692 100644 --- a/ospray/render/distributed/DistributedRenderer.cpp +++ b/ospray/render/distributed/DistributedRenderer.cpp @@ -1,4 +1,4 @@ -// Copyright 2009-2019 Intel Corporation +// Copyright 2009-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "DistributedRenderer.h" diff --git a/scripts/superbuild/CMakeLists.txt b/scripts/superbuild/CMakeLists.txt index 1733e49..58fbe40 100644 --- a/scripts/superbuild/CMakeLists.txt +++ b/scripts/superbuild/CMakeLists.txt @@ -48,25 +48,25 @@ option(ALWAYS_REBUILD "Force every project to always be rebuilt?" OFF) option(DOWNLOAD_ISPC "Download ispc or use the one found in ${PATH}?" ON) -set(BUILD_RKCOMMON_VERSION "v1.4.2" CACHE STRING "Which version of rkcommon to build?") +set(BUILD_RKCOMMON_VERSION "v1.5.1" CACHE STRING "Which version of rkcommon to build?") option(DOWNLOAD_TBB "Download TBB or use the only found in the system environment?" ON) -set(TBB_VERSION "2020.2" CACHE STRING "Which version of TBB to download?") +set(TBB_VERSION "2020.3" CACHE STRING "Which version of TBB to download?") -set(BUILD_EMBREE_VERSION "v3.11.0" CACHE STRING "Which version of Embree to build?") +set(BUILD_EMBREE_VERSION "v3.12.0" CACHE STRING "Which version of Embree to build?") option(BUILD_EMBREE_FROM_SOURCE "Build Embree or use pre-built version?" ON) -set(BUILD_OPENVKL_VERSION "v0.10.0" CACHE STRING "Which version of OpenVKL to build?") +set(BUILD_OPENVKL_VERSION "v0.11.0" CACHE STRING "Which version of OpenVKL to build?") option(BUILD_OIDN "Build OpenImageDenoise as a part of the superbuild." OFF) -set(BUILD_OIDN_VERSION "v1.2.1" CACHE STRING "Which version of OpenImageDenoise to build?") +set(BUILD_OIDN_VERSION "v1.2.4" CACHE STRING "Which version of OpenImageDenoise to build?") option(BUILD_OIDN_FROM_SOURCE "Build OpenImageDenoise or use pre-built version?" OFF) option(BUILD_GLFW "Build glfw for OSPRay examples or use one in existing environment?" ON) option(BUILD_OSPRAY_CI_EXTRAS "Enable OSPRay's extra compiler checks." OFF) -set(BUILD_OSPRAY_VERSION "v2.2.0" CACHE STRING "Which version of OSPRay to build?") +set(BUILD_OSPRAY_VERSION "v2.4.0" CACHE STRING "Which version of OSPRay to build?") option(BUILD_DEPENDENCIES_ONLY "Build the module's dependencies only (aka, OSPRay suberbuild)" OFF) diff --git a/tutorials/GLFWDistribOSPRayWindow.cpp b/tutorials/GLFWDistribOSPRayWindow.cpp index d693ca7..ec1fd01 100644 --- a/tutorials/GLFWDistribOSPRayWindow.cpp +++ b/tutorials/GLFWDistribOSPRayWindow.cpp @@ -1,4 +1,4 @@ -// Copyright 2018-2019 Intel Corporation +// Copyright 2018-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #include "GLFWDistribOSPRayWindow.h" diff --git a/tutorials/example_common.h b/tutorials/example_common.h index 1d9b83e..a1833e8 100644 --- a/tutorials/example_common.h +++ b/tutorials/example_common.h @@ -1,4 +1,4 @@ -// Copyright 2018-2019 Intel Corporation +// Copyright 2018-2020 Intel Corporation // SPDX-License-Identifier: Apache-2.0 #pragma once