Fixes #614: Reduces code duplication regarding flags between `context…

…_t` and `primary_context_t`

src/cuda/api/current_context.hpp

@@ -101,6 +101,7 @@ inline context::flags_t get_flags()
 	context::flags_t result;
 	auto status = cuCtxGetFlags(&result);
 	throw_if_error_lazy(status, "Failed obtaining the current context's flags");
+	// Note: Not sanitizing the flags from having CU_CTX_MAP_HOST set
 	return result;
 }
 

src/cuda/api/device.hpp

@@ -227,6 +227,12 @@ class device_t {
 
 	void set_flags(flags_type new_flags) const
 	{
+		new_flags &= ~CU_CTX_MAP_HOST;
+		// CU_CTX_MAP_HOST is (mostly) ignored since CUDA 3.2, and has been officially
+		// deprecated in CUDA 11. Moreover, in CUDA 11 (and possibly other versions),
+		// the flags you get with cuDevicePrimaryCtxGetState() and cuCtxGetFlag()
+		// differ on this particular flag - and cuDevicePrimaryCtxSetFlags() doesn't
+		// like seeing it.
 		auto status = cuDevicePrimaryCtxSetFlags(id(), new_flags);
 		throw_if_error_lazy(status, "Failed setting (primary context) flags for device " + device::detail_::identify(id_));
 	}

src/cuda/api/primary_context.hpp

@@ -29,18 +29,15 @@ inline state_t raw_state(device::id_t device_id)
 {
 	state_t result;
 	auto status = cuDevicePrimaryCtxGetState(device_id, &result.flags, &result.is_active);
-	throw_if_error(status, "Failed obtaining the state of the primary context for " + device::detail_::identify(device_id));
+	throw_if_error(status, "Failed obtaining the state of the primary context for "
+		+ device::detail_::identify(device_id));
+	// Note: Not sanitizing the flags from having CU_CTX_MAP_HOST set
 	return result;
 }
 
 inline context::flags_t flags(device::id_t device_id)
 {
 	return raw_state(device_id).flags & ~CU_CTX_MAP_HOST;
-		// CU_CTX_MAP_HOST is ignored since CUDA 3.2, and has been officially
-		// deprecated in CUDA 11. Moreover, in CUDA 11 (and possibly other versions),
-		// the flags you get with cuDevicePrimaryCtxGetState() and cuCtxGetFlag()
-		// differ on this particular flag - and cuDevicePrimaryCtxSetFlags() doesn't
-		// like seeing it.
 }
 
 inline bool is_active(device::id_t device_id)
@@ -141,28 +138,6 @@ class primary_context_t : public context_t {
 		// proxy, we are not making this context current on construction
 		// nor expecting it to be current throughout its lifetime.
 
-protected:
-
-	// Note: Hides the base class' non-virtual flags() method
-	context::flags_t flags() const override
-	{
-		return primary_context::detail_::flags(device_id_);
-	}
-
-	void set_flags(flags_type new_flags) const
-	{
-		auto status = cuDevicePrimaryCtxSetFlags(device_id_, new_flags);
-		throw_if_error(status, "Failed setting primary context flags for " + device::detail_::identify(device_id_));
-	}
-
-	void set_flags(
-		device::host_thread_sync_scheduling_policy_t
-		       sync_scheduling_policy = device::host_thread_sync_scheduling_policy_t::heuristic,
-		bool   keep_larger_local_mem_after_resize = true)
-	{
-		set_flags(context::detail_::make_flags(sync_scheduling_policy, keep_larger_local_mem_after_resize));
-	}
-
 public:
 
 	stream_t default_stream() const noexcept;
@@ -182,7 +157,6 @@ class primary_context_t : public context_t {
 		}
 	}
 
-
 	primary_context_t(primary_context_t&& other) noexcept = default;
 
 	~primary_context_t() NOEXCEPT_IF_NDEBUG
@@ -201,31 +175,6 @@ class primary_context_t : public context_t {
 
 	primary_context_t& operator=(const primary_context_t& other) = delete;
 	primary_context_t& operator=(primary_context_t&& other) = default;
-
-public: // mutators of the proxied primary context, but not of the proxy
-
-	void set_sync_scheduling_policy(context::host_thread_sync_scheduling_policy_t new_policy) const
-	{
-		auto other_flags = flags() & ~CU_CTX_SCHED_MASK;
-		set_flags(other_flags | static_cast<flags_type>(new_policy));
-	}
-
-	bool keeping_larger_local_mem_after_resize() const
-	{
-		return flags() & CU_CTX_LMEM_RESIZE_TO_MAX;
-	}
-
-	void keep_larger_local_mem_after_resize(bool keep = true) const
-	{
-		auto other_flags = flags() & ~CU_CTX_LMEM_RESIZE_TO_MAX;
-		flags_type new_flags = other_flags | (keep ? CU_CTX_LMEM_RESIZE_TO_MAX : 0);
-		set_flags(new_flags);
-	}
-
-	void dont_keep_larger_local_mem_after_resize() const
-	{
-		keep_larger_local_mem_after_resize(false);
-	}
 };
 
 namespace primary_context {