Merge remote-tracking branch 'origin/v10-minor'

Author: scip-ci

CHANGELOG

@@ -519,6 +519,8 @@ Fixed bugs
 - aggregate integer variable to not in clique variable in cliquePresolve() of xor constraints to avoid infeasible solutions
 - fixed memory leak in dynamic partition search primal heuristic
 - fixed issue with file existence check in XML parser when SCIP was build with ZLIB support on Windows
+- fixed thread-safety issue when using CppAD and user-defined expression handler
+- fixed typo in `#pragma` directive of redistributed nauty.h
 
 Miscellaneous
 -------------

src/cppad/core/atomic_base.hpp

@@ -12,11 +12,11 @@ A copy of this license is included in the COPYING file of this distribution.
 Please visit http://www.coin-or.org/CppAD/ for information on other licenses.
 -------------------------------------------------------------------------- */
 
+# include <mutex>
+# include <shared_mutex>
 # include <set>
 # include <cppad/core/cppad_assert.hpp>
 # include <cppad/local/sparse_internal.hpp>
-// needed before one can use CPPAD_ASSERT_FIRST_CALL_NOT_PARALLEL
-# include <cppad/utility/thread_alloc.hpp>
 
 namespace CppAD { // BEGIN_CPPAD_NAMESPACE
 /*!
@@ -38,7 +38,7 @@ class atomic_base {
 	// constants
 	//
 	/// index of this object in class_object
-	const size_t index_;
+	size_t index_;
 
 	// -----------------------------------------------------
 	// variables
@@ -79,15 +79,17 @@ class atomic_base {
 	// -----------------------------------------------------
 	// static member functions
 	//
+	// this can become a shared_mutex when moving up to C++17
+	static std::shared_timed_mutex vector_mutex;
 	/// List of all the object in this class
 	static std::vector<atomic_base *>& class_object(void)
-	{	CPPAD_ASSERT_FIRST_CALL_NOT_PARALLEL;
+	{
 		static std::vector<atomic_base *> list_;
 		return list_;
 	}
 	/// List of names for each object in this class
 	static std::vector<std::string>& class_name(void)
-	{	CPPAD_ASSERT_FIRST_CALL_NOT_PARALLEL;
+	{
 		static std::vector<std::string> list_;
 		return list_;
 	}
@@ -102,7 +104,10 @@ class atomic_base {
 
 	/// Name corresponding to a base_atomic object
 	const std::string& afun_name(void) const
-	{	return class_name()[index_]; }
+	{
+		std::shared_lock<std::shared_timed_mutex> vector_lock(vector_mutex);
+		return class_name()[index_];
+	}
 /*
 $begin atomic_ctor$$
 $spell
@@ -159,10 +164,6 @@ all the virtual functions that have their
 
 $head atomic_base$$
 
-$subhead Restrictions$$
-The $code atomic_base$$ constructor cannot be called in
-$cref/parallel/ta_in_parallel/$$ mode.
-
 $subhead Base$$
 The template parameter determines the
 $icode Base$$ type for this $codei%AD<%Base%>%$$ atomic operation.
@@ -237,15 +238,15 @@ atomic_base(
 		const std::string&     name,
 		option_enum            sparsity = bool_sparsity_enum
 ) :
-index_   ( class_object().size()  )  ,
 sparsity_( sparsity               )
-{	CPPAD_ASSERT_KNOWN(
-		! thread_alloc::in_parallel() ,
-		"atomic_base: constructor cannot be called in parallel mode."
-	);
-	class_object().push_back(this);
-	class_name().push_back(name);
-	CPPAD_ASSERT_UNKNOWN( class_object().size() == class_name().size() );
+{
+	{
+		std::unique_lock<std::shared_timed_mutex> vector_lock(vector_mutex);
+		index_ = class_object().size();
+		class_object().push_back(this);
+		class_name().push_back(name);
+		CPPAD_ASSERT_UNKNOWN( class_object().size() == class_name().size() );
+	}
 	//
 	// initialize work pointers as null;
 	for(size_t thread = 0; thread < CPPAD_MAX_NUM_THREADS; thread++)
@@ -254,9 +255,13 @@ sparsity_( sparsity               )
 /// destructor informs CppAD that this atomic function with this index
 /// has dropped out of scope by setting its pointer to null
 virtual ~atomic_base(void)
-{	CPPAD_ASSERT_UNKNOWN( class_object().size() > index_ );
-	// change object pointer to null, but leave name for error reporting
-	class_object()[index_] = CPPAD_NULL;
+{
+	{
+		std::unique_lock<std::shared_timed_mutex> vector_lock(vector_mutex);
+		CPPAD_ASSERT_UNKNOWN( class_object().size() > index_ );
+		// change object pointer to null, but leave name for error reporting
+		class_object()[index_] = CPPAD_NULL;
+	}
 	//
 	// free temporary work memory
 	for(size_t thread = 0; thread < CPPAD_MAX_NUM_THREADS; thread++)
@@ -290,12 +295,16 @@ void free_work(size_t thread)
 }
 /// atomic_base function object corresponding to a certain index
 static atomic_base* class_object(size_t index)
-{	CPPAD_ASSERT_UNKNOWN( class_object().size() > index );
+{
+	std::shared_lock<std::shared_timed_mutex> vector_lock(vector_mutex);
+	CPPAD_ASSERT_UNKNOWN( class_object().size() > index );
 	return class_object()[index];
 }
 /// atomic_base function name corresponding to a certain index
 static const std::string& class_name(size_t index)
-{	CPPAD_ASSERT_UNKNOWN( class_name().size() > index );
+{
+	std::shared_lock<std::shared_timed_mutex> vector_lock(vector_mutex);
+	CPPAD_ASSERT_UNKNOWN( class_name().size() > index );
 	return class_name()[index];
 }
 /*
@@ -2381,10 +2390,6 @@ If there is future use of an $code atomic_base$$ object,
 after a call to $code clear$$,
 the work space will be reallocated and held onto.
 
-$head Restriction$$
-This routine cannot be called
-while in $cref/parallel/ta_in_parallel/$$ execution mode.
-
 $end
 ------------------------------------------------------------------------------
 */
@@ -2394,10 +2399,8 @@ Free all thread_alloc static memory held by atomic_base (avoids reallocations).
 */
 /// Free vector memory used by this class (work space)
 static void clear(void)
-{	CPPAD_ASSERT_KNOWN(
-		! thread_alloc::in_parallel() ,
-		"cannot use atomic_base clear during parallel execution"
-	);
+{
+	std::unique_lock<std::shared_timed_mutex> vector_lock(vector_mutex);
 	size_t i = class_object().size();
 	while(i--)
 	{	atomic_base* op = class_object()[i];
@@ -2419,5 +2422,7 @@ virtual void set_old(size_t id)
 { }
 // ---------------------------------------------------------------------------
 };
+
+template <class Base> std::shared_timed_mutex atomic_base<Base>::vector_mutex;
 } // END_CPPAD_NAMESPACE
 # endif

src/nauty/nauty.h

@@ -1043,17 +1043,17 @@ static int msc_bsr_16(setword x) \
 #include <x86intrin.h>
 #endif
 #if WORDSIZE==128
-#pragma instrinsic(_mm_popcnt_u64)
+#pragma intrinsic(_mm_popcnt_u64)
 #define POPCOUNT(x) ((int)_mm_popcnt_u64((unsigned long long)((x)>>64)) \
                    + (int)_mm_popcnt_u64((unsigned long long)((x)&MASK128R)))
 #elif WORDSIZE==64
-#pragma instrinsic(_mm_popcnt_u64)
+#pragma intrinsic(_mm_popcnt_u64)
 #define POPCOUNT(x) ((int)_mm_popcnt_u64(x))
 #elif WORDSIZE==32 
-#pragma instrinsic(_mm_popcnt_u32)
+#pragma intrinsic(_mm_popcnt_u32)
 #define POPCOUNT(x) _mm_popcnt_u32(x)
 #elif WORDSIZE==16
-#pragma instrinsic(_mm_popcnt_u32)
+#pragma intrinsic(_mm_popcnt_u32)
 #define POPCOUNT(x) _mm_popcnt_u32((unsigned int)(x))
 #endif