Committing Parallel STL 20180322 open source release

Author: tbbdev

CHANGES

@@ -1,6 +1,15 @@
 ------------------------------------------------------------------------
 The list of most significant changes made over time in Parallel STL.
 
+Parallel STL release within Intel(R) Parallel Studio XE 2018 Update 2
+PSTL_VERSION == 103
+
+Features / APIs:
+
+- More algorithms support parallel and/or vector execution policies:
+    find_end, merge, search, search_n
+
+------------------------------------------------------------------------
 Parallel STL 20171127 release
 PSTL_VERSION == 102
 

README.md

@@ -1,5 +1,5 @@
 # Parallel STL 
-[![Stable release](https://img.shields.io/badge/version-20171127-green.svg)](https://github.com/intel/parallelstl/releases/tag/20171127)
+[![Stable release](https://img.shields.io/badge/version-20180322-green.svg)](https://github.com/intel/parallelstl/releases/tag/20180322)
 [![Apache License Version 2.0](https://img.shields.io/badge/license-Apache_2.0-green.svg)](LICENSE)
 
 Parallel STL is an implementation of the C++ standard library algorithms with support for execution policies, 

build/Makefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,11 +47,8 @@ all: $(test_bin)
 test_%.offload.exe: test_%.offload$(OBJ_SFX) exception_list.offload$(OBJ_SFX)
 	$(CPLUS) $(CPLUS_FLAGS) $^ $(FKEY)o$@ $(LDFLAGS)
 
-%.offload$(OBJ_SFX): %.cpp $(PSTL_MAKEFILE)
-	$(CPLUS) $(CPLUS_FLAGS) -D__PSTL_MIC_OFFLOAD -offload-attribute-target=mic -c $< $(FKEY)o$@
-
 $(PSTL_LIB_NAME):
-	$(MAKE) -f $(PSTL_MAKEFILE) backend=$(backend) linkage=$(linkage) cfg=$(cfg)
+	$(MAKE) -f $(PSTL_MAKEFILE) backend=$(backend) cfg=$(cfg)
 
 test_%.exe: test_%$(OBJ_SFX) $(PSTL_LIB_NAME)
 	$(info LIBRARY_PATH=$(LIBRARY_PATH))

build/Makefile.common

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,10 +27,6 @@ ifeq (, $(filter $(MAKECMDGOALS), clean clean_all))
         $(info Threading backend was not specified; using TBB)
         backend=tbb
     endif
-    ifeq (, $(filter $(linkage), shared static none))
-        $(warning using linkage=none (header-only implementation))
-        linkage=none
-    endif
 endif
 
 ifndef os_name
@@ -57,20 +53,12 @@ endif # !os_name
 cfg ?= release
 stdver ?= c++11
 
-override INCLUDES += -I$(proj_root)/include -I$(proj_root)/test 
+override INCLUDES += -I$(proj_root)/include -I$(proj_root)/test
 
 TEST_MACRO += -D__PSTL_TEST_SUCCESSFUL_KEYWORD=1
 
 ifeq ($(backend), tbb)
-    BACKEND_MACRO += -D__PSTL_USE_TBB
-endif
-
-ifneq (, $(filter $(linkage), shared))
-    LINKAGE_MACRO += -D__PSTL_SHARED_LINKAGE
-endif
-
-ifeq (, $(filter $(linkage), none))
-    LINKAGE_MACRO += -D__PSTL_HEADER_ONLY=0
+    BACKEND_MACRO += -D__PSTL_PAR_BACKEND_TBB
 endif
 
 target ?= $(os_name)
@@ -104,7 +92,7 @@ endif
 
 
 OPTIMIZATION_ENABLED_FLAGS += $(XHOST_FLAG)
-OPTIMIZATION_DISABLED_FLAGS += $(XHOST_FLAG) 
+OPTIMIZATION_DISABLED_FLAGS += $(XHOST_FLAG)
 
 
 ifeq ($(cfg), debug)
@@ -120,7 +108,6 @@ DYN_LDFLAGS += $(PSTL_ARCH)
 CPLUS_FLAGS += $(TEST_MACRO)
 CPLUS_FLAGS += $(INCLUDES)
 CPLUS_FLAGS += $(BACKEND_MACRO)
-CPLUS_FLAGS += $(LINKAGE_MACRO)
 CPLUS_FLAGS += $(CXXFLAGS)
 CPLUS_FLAGS += $(OPTIMIZATION_KEYS)
 

build/Makefile.pstl

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,54 +28,12 @@ include $(proj_root)/build/Makefile.common
 
 VPATH = $(proj_root)/src
 
-ifneq (, $(filter $(linkage), shared))
-    CPLUS_FLAGS += -D__PSTL_EXPORTS
-endif
-
-ifeq ($(os_name),windows)
-    ifneq (, $(filter $(linkage), shared))
-        LD = link
-        PSTL_LINKAGE = $(KEY)DLL
-        LIB_EXT = .dll
-    else
-        LD = LIB
-        LIB_EXT = .lib
-    endif
-else
-    LIB_PREFIX = lib
-    ifneq (, $(filter $(linkage), shared))
-        LD = $(compiler)  # ld does not look into LIBRARY_PATH by default for some reason
-        PSTL_LINKAGE = $(KEY)shared
-        CPLUS_FLAGS += $(KEY)fPIC
-        LIB_EXT = .so
-        LD_OUT_KEY = $(KEY)o 
-        TBB_LD_FLAGS = $(LINK_KEY)$(TBB_LIB_NAME)
-        LDFLAGS += $(DYN_LDFLAGS)
-    else
-        LD = ar
-        LIB_EXT = .a
-        LDFLAGS += rs
-        LD_OUT_KEY := 
-    endif
-endif
-
-ifeq ($(backend), tbb)
-    ifeq ($(offload), mic)
-        TBB_LD_FLAGS = $(KEY)tbb
-    endif
-    ifneq (, $(filter $(linkage), shared))
-        LDFLAGS += $(TBB_LD_FLAGS)
-    endif
-endif
-
 lib_src = $(wildcard $(proj_root)/src/*.cpp)
 lib_obj = $(notdir $(lib_src:.cpp=$(OBJ_SFX)))
 
 all: pstl
 
 pstl: $(PSTL_LIB_NAME)
-$(PSTL_LIB_NAME): $(lib_obj)
-	$(LD) $(PSTL_LINKAGE) $(LDFLAGS) $(LD_OUT_KEY)$(LIB_PREFIX)$@$(LIB_EXT) $^
 
 %$(OBJ_SFX): %.cpp $(proj_root)/build/Makefile.pstl
 	$(CPLUS) $(CPLUS_FLAGS) -c $< $(FKEY)o$@

build/android.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,13 +20,26 @@ PSTL_ARCH=
 PIE_FLAGS = -pie -fPIE -fPIC
 SDL_FLAGS = -fstack-protector -Wformat -Wformat-security
 CPLUS_FLAGS += $(TARGET_CFLAGS) $(PIE_FLAGS) $(SDL_FLAGS)
+
 # Paths to the NDK prebuilt tools and libraries
-CPLUS_FLAGS += --sysroot=$(SYSROOT)
+ifneq (,$(findstring $(ndk_version),r16 r16b))
+    ifeq (clang,$(compiler))
+        # Since Android* NDK r16 another sysroot and isystem paths have to be specified
+        CPLUS_FLAGS += --sysroot=$(NDK_ROOT)/sysroot -isystem $(NDK_ROOT)/sysroot/usr/include/$(TRIPLE)
+        # Android* version flag required since r16
+        CPLUS_FLAGS += -D__ANDROID_API__=$(API_LEVEL)
+    else
+        CPLUS_FLAGS += --sysroot=$(SYSROOT)
+    endif
+else
+    CPLUS_FLAGS += --sysroot=$(SYSROOT)
+endif
+
 LDFLAGS += --sysroot=$(SYSROOT) $(TARGET_CFLAGS)
 PSTL_LIB_LINK +=  -lc++abi -L$(CPLUS_LIB_PATH) -lc++_shared
 
 ifeq (arm,$(arch))
-    PSTL_LIB_LINK += -lunwind 
+    PSTL_LIB_LINK += -lunwind
 endif
 
 # TARGET_CXX cames from NDK

build/android.linux.launcher.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 #
 # Libs and executable necessary for testing should be present in the current directory before running.
 # ANDROID_SERIAL must be set to the connected Android target device name for file transfer and test runs.
-# ANDROID_TEST_DIRECTORY may be set to the directory used for testing on the Android target device; otherwise, 
+# ANDROID_TEST_DIRECTORY may be set to the directory used for testing on the Android target device; otherwise,
 #                        the default directory used is "/data/local/tmp/$(basename $PWD)".
 # Note: Do not remove the redirections to '/dev/null' in the script, otherwise the nightly test system will fail.
 
@@ -56,7 +56,7 @@ do case $flag in #
     l )  # Additional library
          ldpreload="$OPTARG " ;; #
     u )  # Stack limit
-         ;; # 
+         ;; #
     q )  # Quiet mode, removes 'done' but prepends any other output by test name
          OUTPUT='2>&1 | sed -e "s/done//;/^[[:space:]]*$/d;s!^!$exename: !"' ;; #
     v )  # Verbose mode

build/clang.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,6 +26,6 @@ XHOST_FLAG = -fno-vectorize
 CPLUS_FLAGS += $(FQKEY)std=$(stdver)
 # XHOST_FLAG = $(KEY)mavx2 -fno-vectorize
 # XHOST_FLAG = $(KEY)mavx512f -fno-vectorize
-# DYN_LDFLAGS += $(LINK_KEY)c++ 
+# DYN_LDFLAGS += $(LINK_KEY)c++
 # CPLUS_FLAGS += -stdlib=libc++
 # CPLUS_FLAGS += -fopenmp-simd //it will be supported in he future version

build/gcc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/icc.inc

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2018 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,12 +18,9 @@
 
 vecreport ?= 0 #may be set to [0..7], see https://software.intel.com/en-us/node/522949 for details
 
-ifeq ($(target),mic)
-    XHOST_FLAG = $(KEY)no-vec
-else
-    XHOST_FLAG = $(KEY)xHOST -no-vec
-    CPLUS_FLAGS += $(QKEY)opt-assume-safe-padding
-endif
+XHOST_FLAG = $(KEY)xHOST -no-vec
+CPLUS_FLAGS += $(QKEY)opt-assume-safe-padding
+
 # XHOST_FLAG = $(KEY)xCORE-AVX2 -no-vec
 # XHOST_FLAG = $(KEY)xSSE4.1 -no-vec
 # XHOST_FLAG = $(KEY)xMIC-AVX512 -no-vec