[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61628] trunk/lib/win64_vc12/tbb: MSVC 2013 windows x64 (vc120) TBB 4.4 static

Martijn Berger martijn.berger at gmail.com
Wed Feb 10 13:45:03 CET 2016


Revision: 61628
          https://developer.blender.org/rBL61628
Author:   juicyfruit
Date:     2016-02-10 12:45:03 +0000 (Wed, 10 Feb 2016)
Log Message:
-----------
MSVC 2013 windows x64 (vc120) TBB 4.4 static 

Added Paths:
-----------
    trunk/lib/win64_vc12/tbb/
    trunk/lib/win64_vc12/tbb/include/
    trunk/lib/win64_vc12/tbb/include/serial/
    trunk/lib/win64_vc12/tbb/include/serial/tbb/
    trunk/lib/win64_vc12/tbb/include/serial/tbb/parallel_for.h
    trunk/lib/win64_vc12/tbb/include/serial/tbb/tbb_annotate.h
    trunk/lib/win64_vc12/tbb/include/tbb/
    trunk/lib/win64_vc12/tbb/include/tbb/aggregator.h
    trunk/lib/win64_vc12/tbb/include/tbb/aligned_space.h
    trunk/lib/win64_vc12/tbb/include/tbb/atomic.h
    trunk/lib/win64_vc12/tbb/include/tbb/blocked_range.h
    trunk/lib/win64_vc12/tbb/include/tbb/blocked_range2d.h
    trunk/lib/win64_vc12/tbb/include/tbb/blocked_range3d.h
    trunk/lib/win64_vc12/tbb/include/tbb/cache_aligned_allocator.h
    trunk/lib/win64_vc12/tbb/include/tbb/combinable.h
    trunk/lib/win64_vc12/tbb/include/tbb/compat/
    trunk/lib/win64_vc12/tbb/include/tbb/compat/condition_variable
    trunk/lib/win64_vc12/tbb/include/tbb/compat/ppl.h
    trunk/lib/win64_vc12/tbb/include/tbb/compat/thread
    trunk/lib/win64_vc12/tbb/include/tbb/compat/tuple
    trunk/lib/win64_vc12/tbb/include/tbb/concurrent_hash_map.h
    trunk/lib/win64_vc12/tbb/include/tbb/concurrent_lru_cache.h
    trunk/lib/win64_vc12/tbb/include/tbb/concurrent_priority_queue.h
    trunk/lib/win64_vc12/tbb/include/tbb/concurrent_queue.h
    trunk/lib/win64_vc12/tbb/include/tbb/concurrent_unordered_map.h
    trunk/lib/win64_vc12/tbb/include/tbb/concurrent_unordered_set.h
    trunk/lib/win64_vc12/tbb/include/tbb/concurrent_vector.h
    trunk/lib/win64_vc12/tbb/include/tbb/critical_section.h
    trunk/lib/win64_vc12/tbb/include/tbb/enumerable_thread_specific.h
    trunk/lib/win64_vc12/tbb/include/tbb/flow_graph.h
    trunk/lib/win64_vc12/tbb/include/tbb/flow_graph_opencl_node.h
    trunk/lib/win64_vc12/tbb/include/tbb/global_control.h
    trunk/lib/win64_vc12/tbb/include/tbb/index.html
    trunk/lib/win64_vc12/tbb/include/tbb/internal/
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_aggregator_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_concurrent_queue_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_concurrent_unordered_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_flow_graph_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_flow_graph_indexer_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_flow_graph_item_buffer_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_flow_graph_join_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_flow_graph_node_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_flow_graph_tagged_buffer_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_flow_graph_trace_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_flow_graph_types_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_mutex_padding.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_range_iterator.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_tbb_hash_compare_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_tbb_strings.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_tbb_windef.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_template_helpers.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_x86_eliding_mutex_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/internal/_x86_rtm_rw_mutex_impl.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/
    trunk/lib/win64_vc12/tbb/include/tbb/machine/gcc_armv7.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/gcc_generic.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/gcc_ia32_common.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/gcc_itsx.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/ibm_aix51.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/icc_generic.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/linux_common.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/linux_ia32.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/linux_ia64.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/linux_intel64.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/mac_ppc.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/macos_common.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/mic_common.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/msvc_armv7.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/msvc_ia32_common.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/sunos_sparc.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/windows_api.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/windows_ia32.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/windows_intel64.h
    trunk/lib/win64_vc12/tbb/include/tbb/machine/xbox360_ppc.h
    trunk/lib/win64_vc12/tbb/include/tbb/memory_pool.h
    trunk/lib/win64_vc12/tbb/include/tbb/mutex.h
    trunk/lib/win64_vc12/tbb/include/tbb/null_mutex.h
    trunk/lib/win64_vc12/tbb/include/tbb/null_rw_mutex.h
    trunk/lib/win64_vc12/tbb/include/tbb/parallel_do.h
    trunk/lib/win64_vc12/tbb/include/tbb/parallel_for.h
    trunk/lib/win64_vc12/tbb/include/tbb/parallel_for_each.h
    trunk/lib/win64_vc12/tbb/include/tbb/parallel_invoke.h
    trunk/lib/win64_vc12/tbb/include/tbb/parallel_reduce.h
    trunk/lib/win64_vc12/tbb/include/tbb/parallel_scan.h
    trunk/lib/win64_vc12/tbb/include/tbb/parallel_sort.h
    trunk/lib/win64_vc12/tbb/include/tbb/parallel_while.h
    trunk/lib/win64_vc12/tbb/include/tbb/partitioner.h
    trunk/lib/win64_vc12/tbb/include/tbb/pipeline.h
    trunk/lib/win64_vc12/tbb/include/tbb/queuing_mutex.h
    trunk/lib/win64_vc12/tbb/include/tbb/queuing_rw_mutex.h
    trunk/lib/win64_vc12/tbb/include/tbb/reader_writer_lock.h
    trunk/lib/win64_vc12/tbb/include/tbb/recursive_mutex.h
    trunk/lib/win64_vc12/tbb/include/tbb/runtime_loader.h
    trunk/lib/win64_vc12/tbb/include/tbb/scalable_allocator.h
    trunk/lib/win64_vc12/tbb/include/tbb/spin_mutex.h
    trunk/lib/win64_vc12/tbb/include/tbb/spin_rw_mutex.h
    trunk/lib/win64_vc12/tbb/include/tbb/task.h
    trunk/lib/win64_vc12/tbb/include/tbb/task_arena.h
    trunk/lib/win64_vc12/tbb/include/tbb/task_group.h
    trunk/lib/win64_vc12/tbb/include/tbb/task_scheduler_init.h
    trunk/lib/win64_vc12/tbb/include/tbb/task_scheduler_observer.h
    trunk/lib/win64_vc12/tbb/include/tbb/tbb.h
    trunk/lib/win64_vc12/tbb/include/tbb/tbb_allocator.h
    trunk/lib/win64_vc12/tbb/include/tbb/tbb_config.h
    trunk/lib/win64_vc12/tbb/include/tbb/tbb_exception.h
    trunk/lib/win64_vc12/tbb/include/tbb/tbb_machine.h
    trunk/lib/win64_vc12/tbb/include/tbb/tbb_profiling.h
    trunk/lib/win64_vc12/tbb/include/tbb/tbb_stddef.h
    trunk/lib/win64_vc12/tbb/include/tbb/tbb_thread.h
    trunk/lib/win64_vc12/tbb/include/tbb/tbbmalloc_proxy.h
    trunk/lib/win64_vc12/tbb/include/tbb/tick_count.h
    trunk/lib/win64_vc12/tbb/lib/
    trunk/lib/win64_vc12/tbb/lib/tbb.lib

Added: trunk/lib/win64_vc12/tbb/include/serial/tbb/parallel_for.h
===================================================================
--- trunk/lib/win64_vc12/tbb/include/serial/tbb/parallel_for.h	                        (rev 0)
+++ trunk/lib/win64_vc12/tbb/include/serial/tbb/parallel_for.h	2016-02-10 12:45:03 UTC (rev 61628)
@@ -0,0 +1,225 @@
+/*
+    Copyright 2005-2015 Intel Corporation.  All Rights Reserved.
+
+    This file is part of Threading Building Blocks. Threading Building Blocks is free software;
+    you can redistribute it and/or modify it under the terms of the GNU General Public License
+    version 2  as  published  by  the  Free Software Foundation.  Threading Building Blocks is
+    distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
+    implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See  the GNU General Public License for more details.   You should have received a copy of
+    the  GNU General Public License along with Threading Building Blocks; if not, write to the
+    Free Software Foundation, Inc.,  51 Franklin St,  Fifth Floor,  Boston,  MA 02110-1301 USA
+
+    As a special exception,  you may use this file  as part of a free software library without
+    restriction.  Specifically,  if other files instantiate templates  or use macros or inline
+    functions from this file, or you compile this file and link it with other files to produce
+    an executable,  this file does not by itself cause the resulting executable to be covered
+    by the GNU General Public License. This exception does not however invalidate any other
+    reasons why the executable file might be covered by the GNU General Public License.
+*/
+
+#ifndef __TBB_SERIAL_parallel_for_H
+#define __TBB_SERIAL_parallel_for_H
+
+#if !TBB_USE_EXCEPTIONS && _MSC_VER
+    // Suppress "C++ exception handler used, but unwind semantics are not enabled" warning in STL headers
+    #pragma warning (push)
+    #pragma warning (disable: 4530)
+#endif
+
+#include <stdexcept>
+#include <string> // required to construct std exception classes
+
+#if !TBB_USE_EXCEPTIONS && _MSC_VER
+    #pragma warning (pop)
+#endif
+
+#include "tbb_annotate.h"
+
+#ifndef __TBB_NORMAL_EXECUTION
+#include "tbb/blocked_range.h"
+#include "tbb/partitioner.h"
+#endif
+
+namespace tbb {
+namespace serial {
+namespace interface9 {
+
+// parallel_for serial annotated implementation
+
+template< typename Range, typename Body, typename Partitioner >
+class start_for : tbb::internal::no_copy {
+    Range my_range;
+    const Body my_body;
+    typename Partitioner::task_partition_type my_partition;
+    void execute();
+
+    //! Constructor for root task.
+    start_for( const Range& range, const Body& body, Partitioner& partitioner ) :
+        my_range( range ),
+        my_body( body ),
+        my_partition( partitioner )
+    {
+    }
+
+    //! Splitting constructor used to generate children.
+    /** this becomes left child.  Newly constructed object is right child. */
+    start_for( start_for& parent_, typename Partitioner::split_type& split_obj ) :
+        my_range( parent_.my_range, split_obj ),
+        my_body( parent_.my_body ),
+        my_partition( parent_.my_partition, split_obj )
+    {
+    }
+
+public:
+    static void run(  const Range& range, const Body& body, Partitioner& partitioner ) {
+        if( !range.empty() ) {
+            ANNOTATE_SITE_BEGIN( tbb_parallel_for );
+            {
+                start_for a( range, body, partitioner );
+                a.execute();
+            }
+            ANNOTATE_SITE_END( tbb_parallel_for );
+        }
+    }
+};
+
+template< typename Range, typename Body, typename Partitioner >
+void start_for< Range, Body, Partitioner >::execute() {
+    if( !my_range.is_divisible() || !my_partition.is_divisible() ) {
+        ANNOTATE_TASK_BEGIN( tbb_parallel_for_range );
+        {
+            my_body( my_range );
+        }
+        ANNOTATE_TASK_END( tbb_parallel_for_range );
+    } else {
+        typename Partitioner::split_type split_obj;
+        start_for b( *this, split_obj );
+        this->execute(); // Execute the left interval first to keep the serial order.
+        b.execute();     // Execute the right interval then.
+    }
+}
+
+//! Parallel iteration over range with default partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+void parallel_for( const Range& range, const Body& body ) {
+    serial::interface9::start_for<Range,Body,const __TBB_DEFAULT_PARTITIONER>::run(range,body,__TBB_DEFAULT_PARTITIONER());
+}
+
+//! Parallel iteration over range with simple partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+void parallel_for( const Range& range, const Body& body, const simple_partitioner& partitioner ) {
+    serial::interface9::start_for<Range,Body,const simple_partitioner>::run(range,body,partitioner);
+}
+
+//! Parallel iteration over range with auto_partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+void parallel_for( const Range& range, const Body& body, const auto_partitioner& partitioner ) {
+    serial::interface9::start_for<Range,Body,const auto_partitioner>::run(range,body,partitioner);
+}
+
+#if TBB_PREVIEW_STATIC_PARTITIONER
+//! Parallel iteration over range with static_partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+void parallel_for( const Range& range, const Body& body, const static_partitioner& partitioner ) {
+    serial::interface9::start_for<Range,Body,const static_partitioner>::run(range,body,partitioner);
+}
+#endif
+
+//! Parallel iteration over range with affinity_partitioner.
+/** @ingroup algorithms **/
+template<typename Range, typename Body>
+void parallel_for( const Range& range, const Body& body, affinity_partitioner& partitioner ) {
+    serial::interface9::start_for<Range,Body,affinity_partitioner>::run(range,body,partitioner);
+}
+
+//! Implementation of parallel iteration over stepped range of integers with explicit step and partitioner (ignored)
+template <typename Index, typename Function, typename Partitioner>
+void parallel_for_impl(Index first, Index last, Index step, const Function& f, Partitioner& ) {
+    if (step <= 0 )
+        throw std::invalid_argument( "nonpositive_step" );
+    else if (last > first) {
+        // Above "else" avoids "potential divide by zero" warning on some platforms
+        ANNOTATE_SITE_BEGIN( tbb_parallel_for );
+        for( Index i = first; i < last; i = i + step ) {
+            ANNOTATE_TASK_BEGIN( tbb_parallel_for_iteration );
+            { f( i ); }
+            ANNOTATE_TASK_END( tbb_parallel_for_iteration );
+        }
+        ANNOTATE_SITE_END( tbb_parallel_for );
+    }
+}
+
+//! Parallel iteration over a range of integers with explicit step and default partitioner
+template <typename Index, typename Function>
+void parallel_for(Index first, Index last, Index step, const Function& f) {
+    parallel_for_impl<Index,Function,const auto_partitioner>(first, last, step, f, auto_partitioner());
+}
+//! Parallel iteration over a range of integers with explicit step and simple partitioner
+template <typename Index, typename Function>
+void parallel_for(Index first, Index last, Index step, const Function& f, const simple_partitioner& p) {
+    parallel_for_impl<Index,Function,const simple_partitioner>(first, last, step, f, p);
+}
+//! Parallel iteration over a range of integers with explicit step and auto partitioner
+template <typename Index, typename Function>
+void parallel_for(Index first, Index last, Index step, const Function& f, const auto_partitioner& p) {
+    parallel_for_impl<Index,Function,const auto_partitioner>(first, last, step, f, p);
+}
+#if TBB_PREVIEW_STATIC_PARTITIONER
+//! Parallel iteration over a range of integers with explicit step and static partitioner
+template <typename Index, typename Function>
+void parallel_for(Index first, Index last, Index step, const Function& f, const static_partitioner& p) {
+    parallel_for_impl<Index,Function,const static_partitioner>(first, last, step, f, p);
+}
+#endif
+//! Parallel iteration over a range of integers with explicit step and affinity partitioner
+template <typename Index, typename Function>
+void parallel_for(Index first, Index last, Index step, const Function& f, affinity_partitioner& p) {
+    parallel_for_impl(first, last, step, f, p);
+}
+
+//! Parallel iteration over a range of integers with default step and default partitioner
+template <typename Index, typename Function>
+void parallel_for(Index first, Index last, const Function& f) {
+    parallel_for_impl<Index,Function,const auto_partitioner>(first, last, static_cast<Index>(1), f, auto_partitioner());
+}
+//! Parallel iteration over a range of integers with default step and simple partitioner
+template <typename Index, typename Function>
+void parallel_for(Index first, Index last, const Function& f, const simple_partitioner& p) {
+    parallel_for_impl<Index,Function,const simple_partitioner>(first, last, static_cast<Index>(1), f, p);
+}
+//! Parallel iteration over a range of integers with default step and auto partitioner
+template <typename Index, typename Function>
+    void parallel_for(Index first, Index last, const Function& f, const auto_partitioner& p) {
+    parallel_for_impl<Index,Function,const auto_partitioner>(first, last, static_cast<Index>(1), f, p);
+}
+#if TBB_PREVIEW_STATIC_PARTITIONER
+//! Parallel iteration over a range of integers with default step and static partitioner
+template <typename Index, typename Function>
+void parallel_for(Index first, Index last, const Function& f, const static_partitioner& p) {
+    parallel_for_impl<Index,Function,const static_partitioner>(first, last, static_cast<Index>(1), f, p);
+}
+#endif
+//! Parallel iteration over a range of integers with default step and affinity_partitioner
+template <typename Index, typename Function>
+void parallel_for(Index first, Index last, const Function& f, affinity_partitioner& p) {
+    parallel_for_impl(first, last, static_cast<Index>(1), f, p);
+}
+
+} // namespace interfaceX
+
+using interface9::parallel_for;
+
+} // namespace serial
+
+#ifndef __TBB_NORMAL_EXECUTION
+using serial::interface9::parallel_for;
+#endif
+
+} // namespace tbb
+
+#endif /* __TBB_SERIAL_parallel_for_H */

Added: trunk/lib/win64_vc12/tbb/include/serial/tbb/tbb_annotate.h

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list