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

Jump to bottom

Replace mkdir by cross-platform counterpart #3446

Closed
wants to merge 1 commit into from
Closed

Replace mkdir by cross-platform counterpart #3446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions examples/mnist/convert_mnist_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include "caffe/proto/caffe.pb.h"
#include "caffe/util/format.hpp"
#include "caffe/util/io.hpp"

#if defined(USE_LEVELDB) && defined(USE_LMDB)

Expand Down Expand Up @@ -90,8 +91,8 @@ void convert_dataset(const char* image_filename, const char* label_filename,
batch = new leveldb::WriteBatch();
} else if (db_backend == "lmdb") { // lmdb
LOG(INFO) << "Opening lmdb " << db_path;
CHECK_EQ(mkdir(db_path, 0744), 0)
<< "mkdir " << db_path << "failed";
CHECK(MakeDir(db_path, 0744))
<< "MakeDir " << db_path << "failed";
CHECK_EQ(mdb_env_create(&mdb_env), MDB_SUCCESS) << "mdb_env_create failed";
CHECK_EQ(mdb_env_set_mapsize(mdb_env, 1099511627776), MDB_SUCCESS) // 1TB
<< "mdb_env_set_mapsize failed";
Expand Down
11 changes: 10 additions & 1 deletion include/caffe/util/io.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,22 @@ namespace caffe {
using ::google::protobuf::Message;
using ::boost::filesystem::path;

inline bool MakeDir(const char* dirname, int perms = 0777) {
bool success = boost::filesystem::create_directory(dirname);
if (success) {
boost::filesystem::permissions(
dirname, static_cast<boost::filesystem::perms>(perms));
}
return success;
}

inline void MakeTempDir(string* temp_dirname) {
temp_dirname->clear();
const path& model =
boost::filesystem::temp_directory_path()/"caffe_test.%%%%-%%%%";
for ( int i = 0; i < CAFFE_TMP_DIR_RETRIES; i++ ) {
const path& dir = boost::filesystem::unique_path(model).string();
bool done = boost::filesystem::create_directory(dir);
bool done = MakeDir(dir.string().c_str());
if ( done ) {
*temp_dirname = dir.string();
return;
Expand Down
4 changes: 3 additions & 1 deletion src/caffe/util/db_lmdb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include <string>

#include "caffe/util/io.hpp"

namespace caffe { namespace db {

const size_t LMDB_MAP_SIZE = 1099511627776; // 1 TB
Expand All @@ -13,7 +15,7 @@ void LMDB::Open(const string& source, Mode mode) {
MDB_CHECK(mdb_env_create(&mdb_env_));
MDB_CHECK(mdb_env_set_mapsize(mdb_env_, LMDB_MAP_SIZE));
if (mode == NEW) {
CHECK_EQ(mkdir(source.c_str(), 0744), 0) << "mkdir " << source << "failed";
CHECK(MakeDir(source.c_str(), 0744)) << "MakeDir " << source << "failed";
}
int flags = 0;
if (mode == READ) {
Expand Down