removed const from src/dst in radixIteration, collides with std::swap

CMakeLists.txt

@@ -23,7 +23,7 @@ MATH(EXPR EMBREE_VERSION_NUMBER "10000*${EMBREE_VERSION_MAJOR} + 100*${EMBREE_VE
 SET(CPACK_RPM_PACKAGE_RELEASE 1)
 
 
-PROJECT(embree${EMBREE_VERSION_MAJOR})
+PROJECT(embree-knc)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
 CONFIGURE_FILE(
@@ -75,11 +75,13 @@ ENDIF()
 OPTION(ENABLE_ISPC_SUPPORT "Build Embree with support for ISPC applications." ON)
 OPTION(ENABLE_TUTORIALS    "Enable to build Embree tutorials" ON)
 
+OPTION(ENABLE_XEON_SUPPORT "Generates code path for Xeon." OFF)
+
 # only support Xeon Phi on Linux
 IF (NOT WIN32 AND NOT APPLE)
   OPTION(ENABLE_XEON_PHI_SUPPORT "Generates code path for Xeon Phi.")
 ELSE()
-  SET(ENABLE_XEON_PHI_SUPPORT OFF CACHE INTERNAL "Xeon Phi only supported on Linux.")
+  SET(ENABLE_XEON_PHI_SUPPORT ON CACHE INTERNAL "Xeon Phi only supported on Linux.")
 ENDIF()
 
 IF (ENABLE_XEON_PHI_SUPPORT)
@@ -281,13 +283,15 @@ IF (ENABLE_TUTORIALS)
   ADD_SUBDIRECTORY(tutorials)
 ENDIF()
 
+IF (ENABLE_XEON_SUPPORT)
   SET (__XEON__ 1)
   ADD_SUBDIRECTORY(tests)
+ENDIF()
 
-  IF (ENABLE_XEON_PHI_SUPPORT)
-    SET (__XEON__ 0)
-    ADD_SUBDIRECTORY(tests tests_xeonphi)
-  ENDIF ()
+IF (ENABLE_XEON_PHI_SUPPORT)
+  SET (__XEON__ 0)
+  ADD_SUBDIRECTORY(tests tests_xeonphi)
+ENDIF ()
 
 ##############################################################
 # Uninstall

common/cmake/FindTBB.cmake

@@ -94,13 +94,13 @@ MARK_AS_ADVANCED(TBB_LIBRARY_MALLOC)
 # Install TBB
 ##############################################################
 
-IF (WIN32)
-  INSTALL(PROGRAMS ${TBB_BINDIR}/tbb.dll ${TBB_BINDIR}/tbbmalloc.dll DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
-  INSTALL(PROGRAMS ${TBB_BINDIR}/tbb.dll ${TBB_BINDIR}/tbbmalloc.dll DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
-ELSEIF (RTCORE_ZIP_MODE)
-  IF (APPLE)
-    INSTALL(PROGRAMS ${TBB_ROOT}/lib/libtbb.dylib ${TBB_ROOT}/lib/libtbbmalloc.dylib DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
-  ELSE()
-    INSTALL(PROGRAMS ${TBB_ROOT}/lib/intel64/gcc4.4/libtbb.so.2 ${TBB_ROOT}/lib/intel64/gcc4.4/libtbbmalloc.so.2 DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
-  ENDIF()
-ENDIF()
+#IF (WIN32)
+#  INSTALL(PROGRAMS ${TBB_BINDIR}/tbb.dll ${TBB_BINDIR}/tbbmalloc.dll DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
+#  INSTALL(PROGRAMS ${TBB_BINDIR}/tbb.dll ${TBB_BINDIR}/tbbmalloc.dll DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
+#ELSEIF (RTCORE_ZIP_MODE)
+#  IF (APPLE)
+#    INSTALL(PROGRAMS ${TBB_ROOT}/lib/libtbb.dylib ${TBB_ROOT}/lib/libtbbmalloc.dylib DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
+#  ELSE()
+#    INSTALL(PROGRAMS ${TBB_ROOT}/lib/intel64/gcc4.4/libtbb.so.2 ${TBB_ROOT}/lib/intel64/gcc4.4/libtbbmalloc.so.2 DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
+#  ENDIF()
+#ENDIF()

common/cmake/embree-config-linux.cmake

@@ -15,7 +15,7 @@
 ## ======================================================================== ##
 
 SET(EMBREE_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_INCLUDEDIR@)
-SET(EMBREE_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/../../libembree.so.@EMBREE_CONFIG_VERSION@)
+#SET(EMBREE_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/../../libembree.so.@EMBREE_CONFIG_VERSION@)
 SET(EMBREE_LIBRARY_XEONPHI ${CMAKE_CURRENT_LIST_DIR}/../../libembree_xeonphi.so.@EMBREE_CONFIG_VERSION@)
 
 MARK_AS_ADVANCED(embree_DIR)

common/cmake/package.cmake

@@ -36,21 +36,21 @@ INSTALL(FILES ${PROJECT_BINARY_DIR}/rtcore.isph DESTINATION ${CMAKE_INSTALL_INCL
 ##############################################################
 # Install Models
 ##############################################################
-INSTALL(DIRECTORY tutorials/models DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
+INSTALL(DIRECTORY tutorials/models DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples_xeonphi)
 
 ##############################################################
 # Install Documentation
 ##############################################################
 
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib)
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/CHANGELOG.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib)
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/README.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib)
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/readme.pdf DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib)
+#INSTALL(FILES ${PROJECT_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib_xeonphi)
+#INSTALL(FILES ${PROJECT_SOURCE_DIR}/CHANGELOG.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib_xeonphi)
+#INSTALL(FILES ${PROJECT_SOURCE_DIR}/README.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib_xeonphi)
+#INSTALL(FILES ${PROJECT_SOURCE_DIR}/readme.pdf DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT lib_xeonphi)
 
-SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/LICENSE.txt" "LICENSE")
-SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/CHANGELOG.txt" "CHANGELOG")
-SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/README.md" "README.md")
-SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/readme.pdf" "readme.pdf")
+#SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/LICENSE.txt" "LICENSE")
+#SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/CHANGELOG.txt" "CHANGELOG")
+#SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/README.md" "README.md")
+#SET(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "${CMAKE_INSTALL_DOCDIR}/readme.pdf" "readme.pdf")
 
 ##############################################################
 # Install scripts to set embree paths
@@ -105,7 +105,7 @@ INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION "$
 ##############################################################
 
 SET(CPACK_PACKAGE_NAME "Embree")
-SET(CPACK_PACKAGE_FILE_NAME "embree-${EMBREE_VERSION}")
+SET(CPACK_PACKAGE_FILE_NAME "embree-knc-${EMBREE_VERSION}")
 #SET(CPACK_PACKAGE_ICON ${PROJECT_SOURCE_DIR}/embree-doc/images/icon.png)
 #SET(CPACK_PACKAGE_RELOCATABLE TRUE)
 #SET(CPACK_STRIP_FILES TRUE) # keep symbols, useful for bug reports
@@ -134,11 +134,11 @@ SET(CPACK_COMPONENT_EXAMPLES_XEONPHI_NAME "Xeon Phi Examples")
 SET(CPACK_COMPONENT_EXAMPLES_XEONPHI_DESCRIPTION "${CPACK_COMPONENT_EXAMPLES_DESCRIPTION}\n${XEONPHI_DESCRIPTION}")
 
 # dependencies between components
-SET(CPACK_COMPONENT_LIB_XEONPHI_DEPENDS lib)
-SET(CPACK_COMPONENT_DEVEL_DEPENDS lib)
-SET(CPACK_COMPONENT_EXAMPLES_DEPENDS lib)
+#SET(CPACK_COMPONENT_LIB_XEONPHI_DEPENDS lib)
+SET(CPACK_COMPONENT_DEVEL_DEPENDS lib_xeonphi)
+#SET(CPACK_COMPONENT_EXAMPLES_DEPENDS lib)
 SET(CPACK_COMPONENT_EXAMPLES_XEONPHI_DEPENDS lib_xeonphi)
-SET(CPACK_COMPONENT_LIB_REQUIRED ON) # always install the libs
+SET(CPACK_COMPONENT_LIB_XEONPHI_REQUIRED ON) # always install the libs
 
 # point to readme and license files
 SET(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md)
@@ -192,7 +192,7 @@ ELSEIF(APPLE)
     SET(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
     SET(CPACK_GENERATOR PackageMaker)
     SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.x86_64")
-    #SET(CPACK_COMPONENTS_ALL lib devel examples)
+    SET(CPACK_COMPONENTS_ALL lib_xeonphi devel examples_xeonphi)
     SET(CPACK_MONOLITHIC_INSTALL 1)
     SET(CPACK_PACKAGE_NAME embree-${EMBREE_VERSION})
     SET(CPACK_PACKAGE_VENDOR "intel") # creates short name com.intel.embree2.xxx in pkgutil
@@ -211,7 +211,8 @@ ELSE()
 
     SET(CPACK_GENERATOR RPM)
     SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_RPM_PACKAGE_RELEASE}.x86_64")
-    SET(CPACK_COMPONENTS_ALL devel lib examples lib_xeonphi examples_xeonphi)
+    #SET(CPACK_COMPONENTS_ALL devel lib examples lib_xeonphi examples_xeonphi)
+    SET(CPACK_COMPONENTS_ALL devel lib_xeonphi examples_xeonphi)
     SET(CPACK_RPM_COMPONENT_INSTALL ON)
     SET(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0") # Apache Software License, Version 2.0
     SET(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")

kernels/CMakeLists.txt

@@ -14,8 +14,10 @@
 ## limitations under the License.                                           ##
 ## ======================================================================== ##
 
-SET(__XEON__ 1)
-ADD_SUBDIRECTORY(xeon)
+IF (ENABLE_XEON_SUPPORT)
+  SET(__XEON__ 1)
+  ADD_SUBDIRECTORY(xeon)
+ENDIF()
 
 IF (ENABLE_XEON_PHI_SUPPORT AND RTCORE_RAY_PACKETS)
   SET(__XEON__ 0)

kernels/algorithms/sort.h

@@ -242,8 +242,8 @@ namespace embree
       
     private:
       
-      void radixIteration(Ty* __restrict const src, 
-			  Ty* __restrict const dst, 
+      void radixIteration(Ty* __restrict src, 
+			  Ty* __restrict dst, 
 			  const size_t startID, 
 			  const size_t endID, 
 			  const size_t threadIndex, 

kernels/xeonphi/CMakeLists.txt

@@ -112,4 +112,4 @@ ELSE()
   SET_TARGET_PROPERTIES(embree_xeonphi PROPERTIES VERSION ${EMBREE_VERSION} SOVERSION ${EMBREE_VERSION_MAJOR})  
 ENDIF()
 
-INSTALL(TARGETS embree_xeonphi LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib_xeonphi NAMELINK_SKIP)
+INSTALL(TARGETS embree_xeonphi LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib_xeonphi)

scripts/release_linux.sh

@@ -34,9 +34,11 @@ rm version.h
 
 # set release settings
 cmake \
+-D CMAKE_BUILD_TYPE=Release \
 -D CMAKE_C_COMPILER:FILEPATH=icc \
 -D CMAKE_CXX_COMPILER:FILEPATH=icpc \
--D XEON_ISA=AVX512KNL \
+-D XEON_ISA=AVX2 \
+-D ENABLE_XEON_SUPPORT=OFF \
 -D ENABLE_XEON_PHI_SUPPORT=ON \
 -D USE_IMAGE_MAGICK=OFF \
 -D USE_LIBJPEG=OFF \
@@ -64,12 +66,12 @@ check_symbols libembree.so CXXABI 1 3
 make -j 16 package
 
 # rename RPMs to have component name before version
-for i in embree-${EMBREE_VERSION}-1.*.rpm ; do 
-  newname=`echo $i | sed -e "s/embree-\(.\+\)-\([a-z_]\+\)\.rpm/embree-\2-\1.rpm/"`
+for i in embree-knc-${EMBREE_VERSION}-1.*.rpm ; do 
+  newname=`echo $i | sed -e "s/embree-knc-\(.\+\)-\([a-z_]\+\)\.rpm/embree-knc-\2-\1.rpm/"`
   mv $i $newname
 done
 
-tar czf embree-${EMBREE_VERSION}.x86_64.rpm.tar.gz embree-*-${EMBREE_VERSION}-1.x86_64.rpm
+tar czf embree-knc-${EMBREE_VERSION}.x86_64.rpm.tar.gz embree-knc*-${EMBREE_VERSION}-1.x86_64.rpm
 
 # create tar.gz files
 cmake \

tutorials/CMakeLists.txt

@@ -16,23 +16,25 @@
 
 ADD_SUBDIRECTORY(common)
 
-SET (__XEON__ 1)
-ADD_SUBDIRECTORY(triangle_geometry)
-ADD_SUBDIRECTORY(dynamic_scene)
-ADD_SUBDIRECTORY(user_geometry)
-ADD_SUBDIRECTORY(viewer)
-ADD_SUBDIRECTORY(instanced_geometry)
-ADD_SUBDIRECTORY(intersection_filter)
-ADD_SUBDIRECTORY(pathtracer)
-ADD_SUBDIRECTORY(hair_geometry)
-ADD_SUBDIRECTORY(subdivision_geometry)
-ADD_SUBDIRECTORY(displacement_geometry)
-ADD_SUBDIRECTORY(bvh_builder)
-ADD_SUBDIRECTORY(lazy_geometry)
-ADD_SUBDIRECTORY(bvh_access)
-ADD_SUBDIRECTORY(motion_blur_geometry)
-ADD_SUBDIRECTORY(interpolation)
-ADD_SUBDIRECTORY(convert)
+IF (ENABLE_XEON_SUPPORT)
+  SET (__XEON__ 1)
+  ADD_SUBDIRECTORY(triangle_geometry)
+  ADD_SUBDIRECTORY(dynamic_scene)
+  ADD_SUBDIRECTORY(user_geometry)
+  ADD_SUBDIRECTORY(viewer)
+  ADD_SUBDIRECTORY(instanced_geometry)
+  ADD_SUBDIRECTORY(intersection_filter)
+  ADD_SUBDIRECTORY(pathtracer)
+  ADD_SUBDIRECTORY(hair_geometry)
+  ADD_SUBDIRECTORY(subdivision_geometry)
+  ADD_SUBDIRECTORY(displacement_geometry)
+  ADD_SUBDIRECTORY(bvh_builder)
+  ADD_SUBDIRECTORY(lazy_geometry)
+  ADD_SUBDIRECTORY(bvh_access)
+  ADD_SUBDIRECTORY(motion_blur_geometry)
+  ADD_SUBDIRECTORY(interpolation)
+  ADD_SUBDIRECTORY(convert)
+ENDIF()
 
 IF (ENABLE_XEON_PHI_SUPPORT AND RTCORE_RAY_PACKETS)
   SET (__XEON__ 0)