Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aksetup_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ def __init__(self, lib_base_name, default_lib_name=None):
default_lib_name = "boost_python-py%d%d" % sys.version_info[:2]
else:
default_lib_name = "boost_%s" % lib_base_name

#print(lib_base_name) #python, thread
Libraries.__init__(self, "BOOST_%s" % lib_base_name.upper(),
[default_lib_name],
help="Library names for Boost C++ %s library (without lib or .so)"
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ def get_config_schema():
ldflags_default.extend(["/FORCE"])
elif "darwin" in sys.platform:
import glob

root_candidates = glob.glob("/Developer/NVIDIA/CUDA-*")
if root_candidates:
cuda_root_default = root_candidates[-1]
Expand Down
7 changes: 6 additions & 1 deletion src/cpp/cuda.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,9 @@ namespace pycuda

// {{{ device
class context;
#if CUDAPP_CUDA_VERSION >= 7000
class primary_context;

#endif
class device
{
private:
Expand Down Expand Up @@ -829,9 +830,12 @@ namespace pycuda
friend void context_push(boost::shared_ptr<context> ctx);
friend boost::shared_ptr<context>
gl::make_gl_context(device const &dev, unsigned int flags);
#if CUDAPP_CUDA_VERSION >= 7000
friend class primary_context;
#endif
};

#if CUDAPP_CUDA_VERSION >= 7000
class primary_context : public context
{
protected:
Expand All @@ -849,6 +853,7 @@ namespace pycuda
CUDAPP_CALL_GUARDED_CLEANUP(cuDevicePrimaryCtxRelease, (m_device));
}
};
#endif

inline
boost::shared_ptr<context> device::make_context(unsigned int flags)
Expand Down