Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Persistent cache #441

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Persistent cache #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3768cab
added clear_persistent_cache and minor update to persistent caching
Mar 21, 2015
ea7a775
clear_persistent_cache now static function and changed hash following…
Mar 22, 2015
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
31 changes: 18 additions & 13 deletions include/boost/compute/program.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,19 +505,24 @@ class program
{
#ifdef BOOST_COMPUTE_USE_OFFLINE_CACHE
// Get hash string for the kernel.
std::string hash;
{
device d(context.get_device());
platform p = d.platform();

std::ostringstream src;
src << "// " << p.name() << " v" << p.version() << "\n"
<< "// " << context.get_device().name() << "\n"
<< "// " << options << "\n\n"
<< source;

hash = detail::sha1(src.str());
}
// std::string hash;
// {
// device d(context.get_device());
// platform p = d.platform();

// std::ostringstream src;
// src << "// " << p.name() << " v" << p.version() << "\n"
// << "// " << context.get_device().name() << "\n"
// << "// " << options << "\n\n"
// << source;
// }

boost::detail::sha1 hash;
hash(p.name());
hash(p.version());
hash(context.get_device().name());
hash(options);
hash(source);

// Try to get cached program binaries:
try {
Expand Down
29 changes: 29 additions & 0 deletions include/boost/compute/utility/program_cache.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,35 @@ class program_cache : boost::noncopyable
m_cache.clear();
}

/// Clears persistent cache by deleting the boost_compute folder
static void clear_persistent_cache()
{
#ifdef BOOST_COMPUTE_USE_OFFLINE_CACHE
// Path delimiter symbol for the current OS.
static const std::string delim = boost::filesystem::path("/").make_preferred().string();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So instead of doing all this here, you should call the detail::appdath_path() function defined in <boost/compute/detail/path.hpp>. I recently extracted this code from the program class so you may have to rebase on top of the develop branch to get it.


// Path to appdata folder.
#ifdef WIN32
static const std::string appdata = detail::getenv("APPDATA")
+ delim + "boost_compute";
#else
static const std::string appdata = detail::getenv("HOME")
+ delim + ".boost_compute";
#endif
try
{
if(boost::filesystem::exists(appdata))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need both an existence check and a try/catch block. I'd lean towards just using the if(exists(appdata)) condition and then removing the try/catch.

{
boost::filesystem::remove_all(appdata);
}
}
catch(boost::filesystem::filesystem_error const & err)
{
std::cout<<err.what()<<std::endl;
}
#endif
}

/// Returns the program object with \p key. Returns a null optional if no
/// program with \p key exists in the cache.
boost::optional<program> get(const std::string &key)
Expand Down