author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
378,349 |
22.02.2017 00:39:55
| 21,600 |
42f4f6be8adb0c21cf6cbfc0c717c7959dd7ff93
|
[JSON] Properties use the same JSON object merging function now
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/json.hpp",
"new_path": "include/occa/tools/json.hpp",
"diff": "@@ -39,6 +39,14 @@ namespace occa {\ntypedef std::vector<json> jsonArray_t;\n+ typedef struct {\n+ std::string string;\n+ primitive number;\n+ jsonObject_t object;\n+ jsonArray_t array;\n+ bool boolean;\n+ } jsonValue_t;\n+\nclass json {\npublic:\nstatic const char objectKeyEndChars[];\n@@ -54,17 +62,16 @@ namespace occa {\n};\ntype_t type;\n+ jsonValue_t value_;\n- struct {\n- std::string string;\n- primitive number;\n- jsonObject_t object;\n- jsonArray_t array;\n- bool boolean;\n- } value_;\n+ inline json(type_t type_ = none_) {\n+ clear();\n+ type = type_;\n+ }\n- json(type_t type_ = none_);\n- json(const json &j);\n+ inline json(const json &j) :\n+ type(j.type),\n+ value_(j.value_) {}\ninline json(const bool value) :\ntype(boolean_) {\n@@ -241,9 +248,11 @@ namespace occa {\nvoid loadFalse(const char *&c);\nvoid loadNull(const char *&c);\n- json operator + (const json &j);\n+ json operator + (const json &j) const;\njson& operator += (const json &j);\n+ void mergeWithObject(const jsonObject_t &obj);\n+\nbool has(const std::string &s) const;\ninline bool isString() const {\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/properties.hpp",
"new_path": "include/occa/tools/properties.hpp",
"diff": "@@ -29,6 +29,7 @@ namespace occa {\nclass properties: public json {\npublic:\nproperties();\n+ properties(const json &j);\nproperties(const char *c);\nproperties(const std::string &s);\n@@ -37,7 +38,11 @@ namespace occa {\nvoid load(const char *&c);\nvoid load(const std::string &s);\n- properties operator + (const properties &p) const;\n+ inline properties operator + (const properties &p) const {\n+ properties ret = *this;\n+ ret.mergeWithObject(p.value_.object);\n+ return ret;\n+ }\n};\nclass hasProperties {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/json.cpp",
"new_path": "src/tools/json.cpp",
"diff": "namespace occa {\nconst char json::objectKeyEndChars[] = \" \\t\\r\\n\\v\\f:\";\n- json::json(type_t type_) {\n- clear();\n- type = type_;\n- }\n-\n- json::json(const json &j) :\n- type(j.type),\n- value_(j.value_) {}\n-\njson& json::clear() {\ntype = none_;\nvalue_.string = \"\";\n@@ -248,7 +239,7 @@ namespace occa {\ntype = null_;\n}\n- json json::operator + (const json &j) {\n+ json json::operator + (const json &j) const {\njson sum = *this;\nsum += j;\nreturn sum;\n@@ -272,10 +263,30 @@ namespace occa {\nbreak;\n}\ncase object_: {\n- cJsonObjectIterator it = j.value_.object.begin();\n- while (it != j.value_.object.end()) {\n+ mergeWithObject(j.value_.object);\n+ break;\n+ }\n+ case array_: {\n+ value_.array.push_back(j);\n+ break;\n+ }\n+ case boolean_: {\n+ value_.boolean += j.value_.boolean;\n+ break;\n+ }\n+ case null_: {\n+ break;\n+ }}\n+ return *this;\n+ }\n+\n+ void json::mergeWithObject(const jsonObject_t &obj) {\n+ cJsonObjectIterator it = obj.begin();\n+ while (it != obj.end()) {\nconst std::string &key = it->first;\nconst json &val = it->second;\n+ ++it;\n+\n// If we're merging two json objects, recursively merge them\nif (val.isObject() && has(key)) {\n// Reuse prefetch\n@@ -288,22 +299,7 @@ namespace occa {\n} else {\nvalue_.object[key] = val;\n}\n- ++it;\n- }\n- break;\n- }\n- case array_: {\n- value_.array.push_back(j);\n- break;\n- }\n- case boolean_: {\n- value_.boolean += j.value_.boolean;\n- break;\n}\n- case null_: {\n- break;\n- }}\n- return *this;\n}\nbool json::has(const std::string &s) const {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/properties.cpp",
"new_path": "src/tools/properties.cpp",
"diff": "@@ -29,6 +29,11 @@ namespace occa {\ntype = object_;\n}\n+ properties::properties(const json &j) {\n+ type = object_;\n+ value_ = j.value_;\n+ }\n+\nproperties::properties(const char *c) {\nload(c);\n}\n@@ -49,14 +54,4 @@ namespace occa {\nconst char *c = s.c_str();\nloadObject(c);\n}\n-\n- properties properties::operator + (const properties &j) const {\n- properties all = *this;\n- cJsonObjectIterator it = j.value_.object.begin();\n- while (it != j.value_.object.end()) {\n- all.value_.object[it->first] = it->second;\n- ++it;\n- }\n- return all;\n- }\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[JSON] Properties use the same JSON object merging function now
|
378,349 |
23.02.2017 22:52:54
| 21,600 |
d19c401b3032a7b1dce1366597939a3a6c1aaa9a
|
[JSON] Added [] operator for arrays, [OCCA] Added caching
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/args.hpp",
"new_path": "include/occa/tools/args.hpp",
"diff": "@@ -188,7 +188,9 @@ namespace occa {\nclass command : public parser {\npublic:\ntypedef bool (*callback_t)(const occa::args::command &command,\n- const json &info);\n+ jsonArray_t order,\n+ jsonObject_t options,\n+ jsonArray_t arguments);\nbool commandIsRequired;\nstd::vector<command> commands;\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/env.hpp",
"new_path": "include/occa/tools/env.hpp",
"diff": "@@ -33,7 +33,7 @@ namespace occa {\nextern std::string OCCA_DIR, OCCA_CACHE_DIR;\nextern size_t OCCA_MEM_BYTE_ALIGN;\n- extern strVector_t OCCA_INCLUDE_PATH;\n+ extern strVector_t OCCA_PATH;\nvoid initialize();\nvoid initSettings();\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/json.hpp",
"new_path": "include/occa/tools/json.hpp",
"diff": "@@ -351,6 +351,9 @@ namespace occa {\nreturn (*this)[s.c_str()];\n}\n+ json& operator [] (const int n);\n+ const json& operator [] (const int n) const;\n+\ntemplate <class TM>\nTM get(const char *c, const TM &default_ = TM()) const {\nconst char *c0 = c;\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/occa.cpp",
"new_path": "scripts/occa.cpp",
"diff": "#include \"occa/tools/sys.hpp\"\nbool runCache(const occa::args::command &command,\n- const occa::json &info);\n+ occa::jsonArray_t order,\n+ occa::jsonObject_t options,\n+ occa::jsonArray_t arguments);\nbool runClear(const occa::args::command &command,\n- const occa::json &info);\n+ occa::jsonArray_t order,\n+ occa::jsonObject_t options,\n+ occa::jsonArray_t arguments);\n+bool runCompile(const occa::args::command &command,\n+ occa::jsonArray_t order,\n+ occa::jsonObject_t options,\n+ occa::jsonArray_t arguments);\nbool runEnv(const occa::args::command &command,\n- const occa::json &info);\n+ occa::jsonArray_t order,\n+ occa::jsonObject_t options,\n+ occa::jsonArray_t arguments);\nbool runInfo(const occa::args::command &command,\n- const occa::json &info);\n+ occa::jsonArray_t order,\n+ occa::jsonObject_t options,\n+ occa::jsonArray_t arguments);\nint main(int argc, char **argv) {\nocca::args::command mainCommand;\n- occa::args::command cacheCommand, clearCommand, envCommand, infoCommand;\n+ occa::args::command cacheCommand, clearCommand, compileCommand, envCommand, infoCommand;\nmainCommand\n.withDescription(\"Can be used to display information of cache kernels.\");\n@@ -50,10 +62,12 @@ int main(int argc, char **argv) {\ncacheCommand\n.withName(\"cache\")\n.withCallback(runCache)\n- .withDescription(\"Compile and cache kernels\")\n- .addRepetitiveArgument(\"RECIPE\",\n- \"JSON/JS recipe file. \"\n- \"The file should be an object with all device and kernel property combinations that will be compiled.\",\n+ .withDescription(\"Cache kernels\")\n+ .addOption('l', \"lib\",\n+ \"Cache kernels in this library directory\",\n+ 1, true)\n+ .addRepetitiveArgument(\"FILE\",\n+ \"OKL files that will be cached.\",\ntrue);\nclearCommand\n@@ -71,6 +85,15 @@ int main(int argc, char **argv) {\n.addOption('o', \"locks\",\n\"Clear cache locks\");\n+ compileCommand\n+ .withName(\"compile\")\n+ .withCallback(runCompile)\n+ .withDescription(\"Compile and cache kernels\")\n+ .addRepetitiveArgument(\"RECIPE\",\n+ \"JSON/JS recipe file. \"\n+ \"The file should be an object with all device and kernel property combinations that will be compiled.\",\n+ true);\n+\nenvCommand\n.withName(\"env\")\n.withCallback(runEnv)\n@@ -127,9 +150,10 @@ bool removeDir(const std::string &dir) {\n}\nbool runClear(const occa::args::command &command,\n- const occa::json &info) {\n+ occa::jsonArray_t order,\n+ occa::jsonObject_t options,\n+ occa::jsonArray_t arguments) {\n- const occa::jsonObject_t &options = info[\"options\"].object();\nocca::cJsonObjectIterator it = options.begin();\nif (it == options.end()) {\n@@ -162,40 +186,49 @@ bool runClear(const occa::args::command &command,\n}\nbool runCache(const occa::args::command &command,\n- const occa::json &info) {\n- return false;\n-}\n-\n-void runUpdate(const int argc, std::string *args) {\n- std::string &library = args[0];\n- std::string libDir = occa::io::dirname(\"occa://\" + library + \"/\");\n-\n+ occa::jsonArray_t order,\n+ occa::jsonObject_t options,\n+ occa::jsonArray_t arguments) {\n+ std::string libDir = occa::io::dirname(\"occa://\" + options[\"lib\"][0][0].string() + \"/\");\nocca::sys::mkpath(libDir);\n- for (int i = 1; i < argc; ++i) {\n- std::string originalFile = occa::io::filename(args[i], true);\n+ const int fileCount = arguments.size();\n+ for (int i = 0; i < fileCount; ++i) {\n+ const std::string &srcFile = arguments[i].string();\n+ const std::string destFile = libDir + occa::io::basename(srcFile);\n- if (!occa::sys::fileExists(originalFile)) {\n+ if (!occa::sys::fileExists(srcFile)) {\n+ std::cerr << occa::yellow(\"Warning\") << \": File '\"\n+ << srcFile << \"' does not exist\\n\";\ncontinue;\n}\n- std::string filename = occa::io::basename(originalFile);\n- std::string newFile = libDir + filename;\n+ std::ifstream src(srcFile.c_str(), std::ios::binary);\n+ std::ofstream dest(destFile.c_str(), std::ios::binary);\n- std::ifstream originalS(originalFile.c_str(), std::ios::binary);\n- std::ofstream newS( newFile.c_str() , std::ios::binary);\n+ dest << src.rdbuf();\n- newS << originalS.rdbuf();\n-\n- originalS.close();\n- newS.close();\n+ src.close();\n+ dest.close();\n+ }\n+ return true;\n}\n+\n+bool runCompile(const occa::args::command &command,\n+ occa::jsonArray_t order,\n+ occa::jsonObject_t options,\n+ occa::jsonArray_t arguments) {\n+ return true;\n}\nbool runEnv(const occa::args::command &command,\n- const occa::json &info) {\n+ occa::jsonArray_t order,\n+ occa::jsonObject_t options,\n+ occa::jsonArray_t arguments) {\nstd::cout << \" Basic:\\n\"\n+ << \" - OCCA_DIR : \" << envEcho(\"OCCA_DIR\") << \"\\n\"\n<< \" - OCCA_CACHE_DIR : \" << envEcho(\"OCCA_CACHE_DIR\") << \"\\n\"\n+ << \" - OCCA_PATH : \" << envEcho(\"OCCA_PATH\") << \"\\n\"\n<< \" Makefile:\\n\"\n<< \" - CXX : \" << envEcho(\"CXX\") << \"\\n\"\n@@ -220,7 +253,9 @@ bool runEnv(const occa::args::command &command,\n}\nbool runInfo(const occa::args::command &command,\n- const occa::json &info) {\n+ occa::jsonArray_t order,\n+ occa::jsonObject_t options,\n+ occa::jsonArray_t arguments) {\nocca::printModeInfo();\n::exit(0);\nreturn true;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/args.cpp",
"new_path": "src/tools/args.cpp",
"diff": "@@ -499,7 +499,10 @@ namespace occa {\ncomm = getCommand(commandName);\n}\n- if (callback && !callback(*this, info)) {\n+ if (callback && !callback(*this,\n+ info[\"order\"].array(),\n+ info[\"options\"].object(),\n+ info[\"arguments\"].array())) {\nprintUsage(std::cerr);\n::exit(1);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/env.cpp",
"new_path": "src/tools/env.cpp",
"diff": "@@ -35,7 +35,7 @@ namespace occa {\nstd::string OCCA_DIR, OCCA_CACHE_DIR;\nsize_t OCCA_MEM_BYTE_ALIGN;\n- strVector_t OCCA_INCLUDE_PATH;\n+ strVector_t OCCA_PATH;\nvoid initialize() {\nstatic bool isInitialized = false;\n@@ -145,14 +145,13 @@ namespace occa {\n}\nvoid initIncludePath() {\n- env::OCCA_INCLUDE_PATH.clear();\n- std::string oip = env::var(\"OCCA_INCLUDE_PATH\");\n+ strVector_t &oipVec = env::OCCA_PATH;\n+ oipVec.clear();\n+ std::string oip = env::var(\"OCCA_PATH\");\nconst char *cStart = oip.c_str();\nconst char *cEnd;\n- strVector_t tmpOIP;\n-\nwhile(cStart[0] != '\\0') {\ncEnd = cStart;\n#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_OSX_OS))\n@@ -166,13 +165,11 @@ namespace occa {\nnewPath = io::filename(newPath);\nio::endWithSlash(newPath);\n- tmpOIP.push_back(newPath);\n+ oipVec.push_back(newPath);\n}\ncStart = (cEnd + (cEnd[0] != '\\0'));\n}\n-\n- tmpOIP.swap(env::OCCA_INCLUDE_PATH);\n}\nvoid registerFileOpeners() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/json.cpp",
"new_path": "src/tools/json.cpp",
"diff": "@@ -378,6 +378,18 @@ namespace occa {\nreturn *j;\n}\n+ json& json::operator [] (const int n) {\n+ OCCA_ERROR(\"Can only apply operator [] with JSON arrays\",\n+ type == array_);\n+ return value_.array[n];\n+ }\n+\n+ const json& json::operator [] (const int n) const {\n+ OCCA_ERROR(\"Can only apply operator [] with JSON arrays\",\n+ type == array_);\n+ return value_.array[n];\n+ }\n+\njson& json::remove(const char *c) {\njson *j = this;\nwhile (*c != '\\0') {\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[JSON] Added [] operator for arrays, [OCCA] Added caching
|
378,349 |
24.02.2017 04:58:12
| 21,600 |
ac45b529a073c49df83c8795ab705c49187aa90e
|
[CI] Fixed parser_sandbox json test
|
[
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/tests/testJson.cpp",
"new_path": "parser_sandbox/tests/testJson.cpp",
"diff": "@@ -25,42 +25,42 @@ void testString() {\n// Normal strings\nj.load(\"\\\"A\\\"\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"A\", j.value.string);\n+ OCCA_TEST_COMPARE(\"A\", j.value_.string);\nj.load(\"'A'\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"A\", j.value.string);\n+ OCCA_TEST_COMPARE(\"A\", j.value_.string);\nj.load(\"\\\"A'\\\"\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"A'\", j.value.string);\n+ OCCA_TEST_COMPARE(\"A'\", j.value_.string);\nj.load(\"'A\\\"'\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"A\\\"\", j.value.string);\n+ OCCA_TEST_COMPARE(\"A\\\"\", j.value_.string);\n// Special chars\nj.load(\"\\\"\\\\\\\"\\\"\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"\\\"\", j.value.string);\n+ OCCA_TEST_COMPARE(\"\\\"\", j.value_.string);\nj.load(\"\\\"\\\\\\\\\\\"\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"\\\\\", j.value.string);\n+ OCCA_TEST_COMPARE(\"\\\\\", j.value_.string);\nj.load(\"\\\"\\\\/\\\"\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"/\", j.value.string);\n+ OCCA_TEST_COMPARE(\"/\", j.value_.string);\nj.load(\"\\\"\\\\b\\\"\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"\\b\", j.value.string);\n+ OCCA_TEST_COMPARE(\"\\b\", j.value_.string);\nj.load(\"\\\"\\\\f\\\"\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"\\f\", j.value.string);\n+ OCCA_TEST_COMPARE(\"\\f\", j.value_.string);\nj.load(\"\\\"\\\\n\\\"\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"\\n\", j.value.string);\n+ OCCA_TEST_COMPARE(\"\\n\", j.value_.string);\nj.load(\"\\\"\\\\r\\\"\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"\\r\", j.value.string);\n+ OCCA_TEST_COMPARE(\"\\r\", j.value_.string);\nj.load(\"\\\"\\\\t\\\"\");\nOCCA_TEST_COMPARE(occa::json::string_, j.type);\n- OCCA_TEST_COMPARE(\"\\t\", j.value.string);\n+ OCCA_TEST_COMPARE(\"\\t\", j.value_.string);\n}\nvoid testNumber() {\n@@ -68,31 +68,31 @@ void testNumber() {\nj.load(\"-10\");\nOCCA_TEST_COMPARE(occa::json::number_, j.type);\n- OCCA_TEST_COMPARE(-10, (int) j.value.number);\n+ OCCA_TEST_COMPARE(-10, (int) j.value_.number);\nj.load(\"10\");\nOCCA_TEST_COMPARE(occa::json::number_, j.type);\n- OCCA_TEST_COMPARE(10, (int) j.value.number);\n+ OCCA_TEST_COMPARE(10, (int) j.value_.number);\nj.load(\"0.1\");\nOCCA_TEST_COMPARE(occa::json::number_, j.type);\n- OCCA_TEST_COMPARE(0.1, (double) j.value.number);\n+ OCCA_TEST_COMPARE(0.1, (double) j.value_.number);\nj.load(\"0.1e10\");\nOCCA_TEST_COMPARE(occa::json::number_, j.type);\n- OCCA_TEST_COMPARE(0.1e10, (double) j.value.number);\n+ OCCA_TEST_COMPARE(0.1e10, (double) j.value_.number);\nj.load(\"0.1E10\");\nOCCA_TEST_COMPARE(occa::json::number_, j.type);\n- OCCA_TEST_COMPARE(0.1E10, (double) j.value.number);\n+ OCCA_TEST_COMPARE(0.1E10, (double) j.value_.number);\nj.load(\"0.1e-10\");\nOCCA_TEST_COMPARE(occa::json::number_, j.type);\n- OCCA_TEST_COMPARE(0.1e-10, (double) j.value.number);\n+ OCCA_TEST_COMPARE(0.1e-10, (double) j.value_.number);\nj.load(\"0.1E-10\");\nOCCA_TEST_COMPARE(occa::json::number_, j.type);\n- OCCA_TEST_COMPARE(0.1E-10, (double) j.value.number);\n+ OCCA_TEST_COMPARE(0.1E-10, (double) j.value_.number);\nj.load(\"0.1e+10\");\nOCCA_TEST_COMPARE(occa::json::number_, j.type);\n- OCCA_TEST_COMPARE(0.1e+10, (double) j.value.number);\n+ OCCA_TEST_COMPARE(0.1e+10, (double) j.value_.number);\nj.load(\"0.1E+10\");\nOCCA_TEST_COMPARE(occa::json::number_, j.type);\n- OCCA_TEST_COMPARE(0.1E+10, (double) j.value.number);\n+ OCCA_TEST_COMPARE(0.1E+10, (double) j.value_.number);\n}\nvoid testObject() {\n@@ -100,32 +100,32 @@ void testObject() {\nj.load(\"{\\\"0\\\":0, \\\"1\\\":1}\");\nOCCA_TEST_COMPARE(occa::json::object_, j.type);\n- OCCA_TEST_COMPARE(2, (int) j.value.object.size());\n- OCCA_TEST_COMPARE(0, (int) j.value.object[\"0\"]);\n- OCCA_TEST_COMPARE(1, (int) j.value.object[\"1\"]);\n+ OCCA_TEST_COMPARE(2, (int) j.value_.object.size());\n+ OCCA_TEST_COMPARE(0, (int) j.value_.object[\"0\"]);\n+ OCCA_TEST_COMPARE(1, (int) j.value_.object[\"1\"]);\nj.load(\"{\\\"0\\\":0, \\\"1\\\":1,}\");\nOCCA_TEST_COMPARE(occa::json::object_, j.type);\n- OCCA_TEST_COMPARE(2, (int) j.value.object.size());\n- OCCA_TEST_COMPARE(occa::json::number_, j.value.object[\"0\"].type);\n- OCCA_TEST_COMPARE(occa::json::number_, j.value.object[\"1\"].type);\n- OCCA_TEST_COMPARE(0, (int) j.value.object[\"0\"]);\n- OCCA_TEST_COMPARE(1, (int) j.value.object[\"1\"]);\n+ OCCA_TEST_COMPARE(2, (int) j.value_.object.size());\n+ OCCA_TEST_COMPARE(occa::json::number_, j.value_.object[\"0\"].type);\n+ OCCA_TEST_COMPARE(occa::json::number_, j.value_.object[\"1\"].type);\n+ OCCA_TEST_COMPARE(0, (int) j.value_.object[\"0\"]);\n+ OCCA_TEST_COMPARE(1, (int) j.value_.object[\"1\"]);\n// Short-hand notation\nj.load(\"{0:0, 1:1}\");\nOCCA_TEST_COMPARE(occa::json::object_, j.type);\n- OCCA_TEST_COMPARE(2, (int) j.value.object.size());\n- OCCA_TEST_COMPARE(0, (int) j.value.object[\"0\"]);\n- OCCA_TEST_COMPARE(1, (int) j.value.object[\"1\"]);\n+ OCCA_TEST_COMPARE(2, (int) j.value_.object.size());\n+ OCCA_TEST_COMPARE(0, (int) j.value_.object[\"0\"]);\n+ OCCA_TEST_COMPARE(1, (int) j.value_.object[\"1\"]);\nj.load(\"{0:0, 1:1,}\");\nOCCA_TEST_COMPARE(occa::json::object_, j.type);\n- OCCA_TEST_COMPARE(2, (int) j.value.object.size());\n- OCCA_TEST_COMPARE(occa::json::number_, j.value.object[\"0\"].type);\n- OCCA_TEST_COMPARE(occa::json::number_, j.value.object[\"1\"].type);\n- OCCA_TEST_COMPARE(0, (int) j.value.object[\"0\"]);\n- OCCA_TEST_COMPARE(1, (int) j.value.object[\"1\"]);\n+ OCCA_TEST_COMPARE(2, (int) j.value_.object.size());\n+ OCCA_TEST_COMPARE(occa::json::number_, j.value_.object[\"0\"].type);\n+ OCCA_TEST_COMPARE(occa::json::number_, j.value_.object[\"1\"].type);\n+ OCCA_TEST_COMPARE(0, (int) j.value_.object[\"0\"]);\n+ OCCA_TEST_COMPARE(1, (int) j.value_.object[\"1\"]);\n// Test path\nj.load(\"{0: {1: {2: {3: 3}}}}\");\n@@ -137,21 +137,21 @@ void testArray() {\nj.load(\"[1, 2]\");\nOCCA_TEST_COMPARE(occa::json::array_, j.type);\n- OCCA_TEST_COMPARE(2, (int) j.value.array.size());\n+ OCCA_TEST_COMPARE(2, (int) j.value_.array.size());\n- OCCA_TEST_COMPARE(occa::json::number_, j.value.array[0].type);\n- OCCA_TEST_COMPARE(occa::json::number_, j.value.array[1].type);\n- OCCA_TEST_COMPARE(1, (int) j.value.array[0]);\n- OCCA_TEST_COMPARE(2, (int) j.value.array[1]);\n+ OCCA_TEST_COMPARE(occa::json::number_, j.value_.array[0].type);\n+ OCCA_TEST_COMPARE(occa::json::number_, j.value_.array[1].type);\n+ OCCA_TEST_COMPARE(1, (int) j.value_.array[0]);\n+ OCCA_TEST_COMPARE(2, (int) j.value_.array[1]);\nj.load(\"[1, 2,]\");\nOCCA_TEST_COMPARE(occa::json::array_, j.type);\n- OCCA_TEST_COMPARE(2, (int) j.value.array.size());\n+ OCCA_TEST_COMPARE(2, (int) j.value_.array.size());\n- OCCA_TEST_COMPARE(occa::json::number_, j.value.array[0].type);\n- OCCA_TEST_COMPARE(occa::json::number_, j.value.array[1].type);\n- OCCA_TEST_COMPARE(1, (int) j.value.array[0]);\n- OCCA_TEST_COMPARE(2, (int) j.value.array[1]);\n+ OCCA_TEST_COMPARE(occa::json::number_, j.value_.array[0].type);\n+ OCCA_TEST_COMPARE(occa::json::number_, j.value_.array[1].type);\n+ OCCA_TEST_COMPARE(1, (int) j.value_.array[0]);\n+ OCCA_TEST_COMPARE(2, (int) j.value_.array[1]);\n}\nvoid testKeywords() {\n@@ -159,10 +159,10 @@ void testKeywords() {\nj.load(\"true\");\nOCCA_TEST_COMPARE(occa::json::boolean_, j.type);\n- OCCA_TEST_COMPARE(true, j.value.boolean);\n+ OCCA_TEST_COMPARE(true, j.value_.boolean);\nj.load(\"false\");\nOCCA_TEST_COMPARE(occa::json::boolean_, j.type);\n- OCCA_TEST_COMPARE(false, j.value.boolean);\n+ OCCA_TEST_COMPARE(false, j.value_.boolean);\nj.load(\"null\");\nOCCA_TEST_COMPARE(occa::json::null_, j.type);\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[CI] Fixed parser_sandbox json test
|
378,349 |
25.02.2017 18:30:41
| 21,600 |
50f3c380dbc3390a0f16eb927cccb5716d56f4aa
|
[LICENCE] Update
|
[
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "# The MIT License (MIT)\n#\n-# Copyright (c) 2014-2016 David Medina and Tim Warburton\n+# Copyright (c) 2014-2017 David Medina and Tim Warburton\n#\n# Permission is hereby granted, free of charge, to any person obtaining a copy\n# of this software and associated documentation files (the \"Software\"), to deal\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa.hpp",
"new_path": "include/occa.hpp",
"diff": "#define OCCA_HEADER\n#include \"occa/base.hpp\"\n+#include \"occa/array.hpp\"\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/array/array.hpp",
"new_path": "include/occa/array/array.hpp",
"diff": "/* The MIT License (MIT)\n*\n- * Copyright (c) 2014-2017 David Median and Tim Warburton\n+ * Copyright (c) 2014-2017 David Medina and Tim Warburton\n*\n* Permission is hereby granted, free of charge, to any person obtaining a copy\n* of this software and associated documentation files (the \"Software\"), to deal\n@@ -38,7 +38,7 @@ namespace occa {\ntemplate <class TM, const int idxType = occa::dontUseIdxOrder>\nclass array {\n- public:\n+ private:\nocca::device device;\nocca::memory memory_;\n@@ -51,6 +51,7 @@ namespace occa {\nudim_t fs_[7]; // Full Strides (used with idxOrder)\nint sOrder_[6]; // Stride Ordering\n+ public:\narray();\ntemplate <class TM2, const int idxType2>\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/Makefile",
"new_path": "scripts/Makefile",
"diff": "# The MIT License (MIT)\n#\n-# Copyright (c) 2014-2016 David Medina and Tim Warburton\n+# Copyright (c) 2014-2017 David Medina and Tim Warburton\n#\n# Permission is hereby granted, free of charge, to any person obtaining a copy\n# of this software and associated documentation files (the \"Software\"), to deal\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/compiledDefinesTemplate.hpp",
"new_path": "scripts/compiledDefinesTemplate.hpp",
"diff": "/* The MIT License (MIT)\n*\n- * Copyright (c) 2014-2016 David Medina and Tim Warburton\n+ * Copyright (c) 2014-2017 David Medina and Tim Warburton\n*\n* Permission is hereby granted, free of charge, to any person obtaining a copy\n* of this software and associated documentation files (the \"Software\"), to deal\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/compilerVendorTest.cpp",
"new_path": "scripts/compilerVendorTest.cpp",
"diff": "/* The MIT License (MIT)\n*\n- * Copyright (c) 2014-2016 David Medina and Tim Warburton\n+ * Copyright (c) 2014-2017 David Medina and Tim Warburton\n*\n* Permission is hereby granted, free of charge, to any person obtaining a copy\n* of this software and associated documentation files (the \"Software\"), to deal\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/make.py",
"new_path": "scripts/make.py",
"diff": "# The MIT License (MIT)\n#\n-# Copyright (c) 2014-2016 David Medina and Tim Warburton\n+# Copyright (c) 2014-2017 David Medina and Tim Warburton\n#\n# Permission is hereby granted, free of charge, to any person obtaining a copy\n# of this software and associated documentation files (the \"Software\"), to deal\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/occa.cpp",
"new_path": "scripts/occa.cpp",
"diff": "/* The MIT License (MIT)\n*\n- * Copyright (c) 2014-2016 David Medina and Tim Warburton\n+ * Copyright (c) 2014-2017 David Medina and Tim Warburton\n*\n* Permission is hereby granted, free of charge, to any person obtaining a copy\n* of this software and associated documentation files (the \"Software\"), to deal\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/openmpTest.cpp",
"new_path": "scripts/openmpTest.cpp",
"diff": "/* The MIT License (MIT)\n*\n- * Copyright (c) 2014-2016 David Medina and Tim Warburton\n+ * Copyright (c) 2014-2017 David Medina and Tim Warburton\n*\n* Permission is hereby granted, free of charge, to any person obtaining a copy\n* of this software and associated documentation files (the \"Software\"), to deal\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/setupKernelOperators.py",
"new_path": "scripts/setupKernelOperators.py",
"diff": "# The MIT License (MIT)\n#\n-# Copyright (c) 2014-2016 David Medina and Tim Warburton\n+# Copyright (c) 2014-2017 David Medina and Tim Warburton\n#\n# Permission is hereby granted, free of charge, to any person obtaining a copy\n# of this software and associated documentation files (the \"Software\"), to deal\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/shellTools.sh",
"new_path": "scripts/shellTools.sh",
"diff": "# The MIT License (MIT)\n#\n-# Copyright (c) 2014-2016 David Medina and Tim Warburton\n+# Copyright (c) 2014-2017 David Medina and Tim Warburton\n#\n# Permission is hereby granted, free of charge, to any person obtaining a copy\n# of this software and associated documentation files (the \"Software\"), to deal\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[LICENCE] Update
|
378,349 |
25.02.2017 18:42:15
| 21,600 |
e08874567bedcf6a49f38bd62be47d7e27b4dbb8
|
[Array] Renamed entries -> size
|
[
{
"change_type": "MODIFY",
"old_path": "examples/usingArrays/main.cpp",
"new_path": "examples/usingArrays/main.cpp",
"diff": "@@ -112,7 +112,7 @@ void printVector(occa::array<TM,TMi> &a) {\nocca::finish();\nstd::cout << '[';\n- for (int i = 0; i < (int) a.entries(); ++i) {\n+ for (int i = 0; i < (int) a.size(); ++i) {\nif (i) std::cout << \", \";\nstd::cout << a[i];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/array/array.hpp",
"new_path": "include/occa/array/array.hpp",
"diff": "@@ -81,12 +81,12 @@ namespace occa {\nreturn memory_;\n}\n- inline udim_t entries() const {\n+ inline udim_t size() const {\nreturn s_[0] * s_[1] * s_[2] * s_[3] * s_[4] * s_[5];\n}\ninline udim_t bytes() const {\n- return (entries() * sizeof(TM));\n+ return (size() * sizeof(TM));\n}\ninline udim_t dim(const int i) const {\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Array] Renamed entries -> size
|
378,349 |
26.02.2017 00:55:18
| 21,600 |
95ab7061740454d77a16eaa5d29eb2fe78f2dbc9
|
[IO] occa:// was not looking at libraryPath, [Hash] Has isInitialized()
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/hash.hpp",
"new_path": "include/occa/tools/hash.hpp",
"diff": "@@ -43,6 +43,10 @@ namespace occa {\nhash_t(const hash_t &hash);\nhash_t& operator = (const hash_t &hash);\n+ void clear();\n+\n+ inline bool isInitialized() const { return initialized; }\n+\nbool operator < (const hash_t &fo) const;\nbool operator == (const hash_t &fo) const;\nbool operator != (const hash_t &fo) const;\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/occa.cpp",
"new_path": "scripts/occa.cpp",
"diff": "@@ -189,7 +189,7 @@ bool runCache(const occa::args::command &command,\nocca::jsonArray_t order,\nocca::jsonObject_t options,\nocca::jsonArray_t arguments) {\n- std::string libDir = occa::io::dirname(\"occa://\" + options[\"lib\"][0][0].string() + \"/\");\n+ std::string libDir = occa::io::libraryPath() + options[\"lib\"][0][0].string() + \"/\";\nocca::sys::mkpath(libDir);\nconst int fileCount = arguments.size();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/hash.cpp",
"new_path": "src/tools/hash.cpp",
"diff": "@@ -65,6 +65,10 @@ namespace occa {\nreturn *this;\n}\n+ void hash_t::clear() {\n+ *this = hash_t();\n+ }\n+\nbool hash_t::operator < (const hash_t &fo) const {\nfor (int i = 0; i < 8; ++i) {\nif (h[i] < fo.h[i]) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/io.cpp",
"new_path": "src/tools/io.cpp",
"diff": "@@ -104,7 +104,7 @@ namespace occa {\n}\nstd::string occaFileOpener_t::expand(const std::string &filename) {\n- return (env::OCCA_CACHE_DIR + filename.substr(7));\n+ return (libraryPath() + filename.substr(7));\n}\n// ================================\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[IO] occa:// was not looking at libraryPath, [Hash] Has isInitialized()
|
378,349 |
05.03.2017 00:17:45
| 21,600 |
ba4e8c8b4fc27a6e7e49056f6522cfe4ccacd1e3
|
[Linalg] Reduction start is unique with min/max
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/array/kernels/linalg.okl",
"new_path": "include/occa/array/kernels/linalg.okl",
"diff": "#endif\n#define CPU_CHUNK ((entries + CPU_DOT_OUTER - 1)/ CPU_DOT_OUTER)\n-#define CPU_REDUCTION_BODY(OPERATION, RED_OPERATION) \\\n+#define CPU_REDUCTION_BODY(INIT, OPERATION, RED_OPERATION) \\\nfor (int oi = 0; oi < CPU_DOT_OUTER; ++oi; outer) { \\\n- VTYPE r_red = 0; \\\n+ VTYPE r_red = INIT(oi); \\\nfor (int i = 0; i < CPU_CHUNK; ++i; inner) { \\\nif ((oi * CPU_CHUNK + i) < entries) { \\\nOPERATION(r_red, oi * CPU_CHUNK + i); \\\n} \\\n}\n-#define GPU_REDUCTION_BODY(OPERATION, RED_OPERATION) \\\n+#define GPU_REDUCTION_BODY(INIT, OPERATION, RED_OPERATION) \\\nfor (int oi = 0; oi < (entries + GPU_DOT_OUTER - 1)/GPU_DOT_OUTER; ++oi; outer) { \\\nshared VTYPE s_red[GPU_DOT_INNER]; \\\n\\\nfor (int i = 0; i < (GPU_DOT_INNER * GPU_DOT_BLOCK); i += GPU_DOT_INNER; inner) { \\\n- VTYPE r_red = 0; \\\n+ VTYPE r_red = INIT(oi); \\\nfor (int j = 0; j < GPU_DOT_BLOCK; ++j) { \\\nif ((oi*GPU_DOT_OUTER + i*GPU_DOT_BLOCK + j) < entries) { \\\nOPERATION(r_red, oi*GPU_DOT_OUTER + i*GPU_DOT_BLOCK + j); \\\n# define REDUCTION_BODY GPU_REDUCTION_BODY\n#endif\n+#define INIT_ZERO(i) 0\n+#define INIT_FIRST(i) (i) < entries ? vec[i] : vec[0]\n+\n#define SUM_RED_OPERATION(red, part) \\\nred += part\n@@ -109,7 +112,7 @@ kernel void l1Norm(const int entries,\nRETTYPE * vecReduction) {\n#define L1_NORM_OPERATION(out, idx) \\\nout += abs(vec[idx])\n- REDUCTION_BODY(L1_NORM_OPERATION, SUM_RED_OPERATION);\n+ REDUCTION_BODY(INIT_ZERO, L1_NORM_OPERATION, SUM_RED_OPERATION);\n}\nkernel void l2Norm(const int entries,\n@@ -118,7 +121,7 @@ kernel void l2Norm(const int entries,\n#define L2_NORM_OPERATION(out, idx) \\\nconst VTYPE vec_i = vec[idx]; \\\nout += vec_i * vec_i;\n- REDUCTION_BODY(L2_NORM_OPERATION, SUM_RED_OPERATION);\n+ REDUCTION_BODY(INIT_ZERO, L2_NORM_OPERATION, SUM_RED_OPERATION);\n}\nkernel void lpNorm(const int entries,\n@@ -128,7 +131,7 @@ kernel void lpNorm(const int entries,\n#define LP_NORM_OPERATION(out, idx) \\\nconst VTYPE vec_i = vec[idx]; \\\nout += pow(vec_i, p)\n- REDUCTION_BODY(LP_NORM_OPERATION, SUM_RED_OPERATION);\n+ REDUCTION_BODY(INIT_ZERO, LP_NORM_OPERATION, SUM_RED_OPERATION);\n}\nkernel void lInfNorm(const int entries,\n@@ -137,7 +140,7 @@ kernel void lInfNorm(const int entries,\n#define LINF_NORM_OPERATION(out, idx) \\\nconst VTYPE vec_i = vec[idx]; \\\nout = abs(out*out > vec_i*vec_i ? out : vec_i)\n- REDUCTION_BODY(LINF_NORM_OPERATION, ABS_MAX_RED_OPERATION);\n+ REDUCTION_BODY(INIT_ZERO, LINF_NORM_OPERATION, ABS_MAX_RED_OPERATION);\n}\nkernel void vecMax(const int entries,\n@@ -146,7 +149,7 @@ kernel void vecMax(const int entries,\n#define MAX_OPERATION(out, idx) \\\nconst VTYPE vec_i = vec[idx]; \\\nout = out > vec_i ? out : vec_i\n- REDUCTION_BODY(MAX_OPERATION, MAX_RED_OPERATION);\n+ REDUCTION_BODY(INIT_FIRST, MAX_OPERATION, MAX_RED_OPERATION);\n}\nkernel void vecMin(const int entries,\n@@ -155,7 +158,7 @@ kernel void vecMin(const int entries,\n#define MIN_OPERATION(out, idx) \\\nconst VTYPE vec_i = vec[idx]; \\\nout = out < vec_i ? out : vec_i\n- REDUCTION_BODY(MIN_OPERATION, MIN_RED_OPERATION);\n+ REDUCTION_BODY(INIT_FIRST, MIN_OPERATION, MIN_RED_OPERATION);\n}\nkernel void dot(const int entries,\n@@ -164,7 +167,7 @@ kernel void dot(const int entries,\nRETTYPE * vecReduction) {\n#define DOT_OPERATION(out, idx) \\\nout += vec1[idx] * vec2[idx]\n- REDUCTION_BODY(DOT_OPERATION, SUM_RED_OPERATION);\n+ REDUCTION_BODY(INIT_ZERO, DOT_OPERATION, SUM_RED_OPERATION);\n}\nkernel void sum(const int entries,\n@@ -172,7 +175,7 @@ kernel void sum(const int entries,\nRETTYPE * vecReduction) {\n#define SUM_OPERATION(out, idx) \\\nout += vec[idx]\n- REDUCTION_BODY(SUM_OPERATION, SUM_RED_OPERATION);\n+ REDUCTION_BODY(INIT_ZERO, SUM_OPERATION, SUM_RED_OPERATION);\n}\nkernel void distance(const int entries,\n@@ -182,7 +185,7 @@ kernel void distance(const int entries,\n#define DISTANCE_OPERATION(out, idx) \\\nconst RETTYPE diff = (vec1[idx] - vec2[idx]); \\\nout += diff * diff\n- REDUCTION_BODY(DISTANCE_OPERATION, SUM_RED_OPERATION);\n+ REDUCTION_BODY(INIT_ZERO, DISTANCE_OPERATION, SUM_RED_OPERATION);\n}\nkernel void axpy(const int entries,\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Linalg] Reduction start is unique with min/max
|
378,349 |
05.03.2017 11:58:55
| 21,600 |
772cef6d6016d0b05b7f8bd2847b0a65c3f394c0
|
[Args] callback wasn't initialized as NULL
|
[
{
"change_type": "MODIFY",
"old_path": "src/tools/args.cpp",
"new_path": "src/tools/args.cpp",
"diff": "@@ -382,7 +382,10 @@ namespace occa {\nvoid parser::printRequired(std::ostream &out) {}\n//---[ Command ]--------------------\n- command::command() {}\n+ command::command() :\n+ commandIsRequired(false),\n+ callback(NULL),\n+ runParent(NULL) {}\ncommand& command::withName(const std::string &name_) {\nname = name_;\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Args] callback wasn't initialized as NULL
|
378,349 |
06.03.2017 01:10:36
| 21,600 |
2cfff1f3c8b7c65b117b9ed2c84c1e571471e796
|
[CUDA] Async copy was backwards, [Linalg] Reduction fix
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/array/array.tpp",
"new_path": "include/occa/array/array.tpp",
"diff": "namespace occa {\ntemplate <class TM, const int idxType>\narray<TM,idxType>::array() :\n+ device(),\n+ memory_(),\ndata_(NULL) {\n+ for (int i = 0; i < 6; ++i) {\n+ ks_[i] = 0;\n+ s_[i] = 0;\n+ sOrder_[i] = i;\n+ }\ninitSOrder();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/array/kernels/linalg.okl",
"new_path": "include/occa/array/kernels/linalg.okl",
"diff": "#endif\n#define INIT_ZERO(i) 0\n-#define INIT_FIRST(i) (i) < entries ? vec[i] : vec[0]\n+#define INIT_FIRST(i) vec[0]\n#define SUM_RED_OPERATION(red, part) \\\nred += part\n#define ABS_MAX_RED_OPERATION(red, part) \\\n- red = abs(red*red > part*part ? red : part)\n+ red = occaFabs(red*red > part*part ? red : part)\n#define MAX_RED_OPERATION(red, part) \\\nred = red > part ? red : part\n@@ -111,7 +111,7 @@ kernel void l1Norm(const int entries,\nconst VTYPE * vec,\nRETTYPE * vecReduction) {\n#define L1_NORM_OPERATION(out, idx) \\\n- out += abs(vec[idx])\n+ out += occaFabs(vec[idx])\nREDUCTION_BODY(INIT_ZERO, L1_NORM_OPERATION, SUM_RED_OPERATION);\n}\n@@ -130,7 +130,7 @@ kernel void lpNorm(const int entries,\nRETTYPE * vecReduction) {\n#define LP_NORM_OPERATION(out, idx) \\\nconst VTYPE vec_i = vec[idx]; \\\n- out += pow(vec_i, p)\n+ out += occaPow(vec_i, p)\nREDUCTION_BODY(INIT_ZERO, LP_NORM_OPERATION, SUM_RED_OPERATION);\n}\n@@ -139,7 +139,7 @@ kernel void lInfNorm(const int entries,\nRETTYPE * vecReduction) {\n#define LINF_NORM_OPERATION(out, idx) \\\nconst VTYPE vec_i = vec[idx]; \\\n- out = abs(out*out > vec_i*vec_i ? out : vec_i)\n+ out = occaFabs(out*out > vec_i*vec_i ? out : vec_i)\nREDUCTION_BODY(INIT_ZERO, LINF_NORM_OPERATION, ABS_MAX_RED_OPERATION);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/device.cpp",
"new_path": "src/modes/cuda/device.cpp",
"diff": "@@ -199,7 +199,7 @@ namespace occa {\nconst void *src,\nconst occa::properties &props) {\n- if (props.get<bool>(\"mapped\")) {\n+ if (props.get<bool>(\"mapped\", false)) {\nreturn mappedAlloc(bytes, src);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/memory.cpp",
"new_path": "src/modes/cuda/memory.cpp",
"diff": "@@ -55,7 +55,7 @@ namespace occa {\nconst CUstream &stream = *((CUstream*) dHandle->currentStream);\nconst bool async = props.get(\"async\", false);\n- if (async) {\n+ if (!async) {\nOCCA_CUDA_ERROR(\"Memory: Copy From\",\ncuMemcpyHtoD(*((CUdeviceptr*) handle) + offset,\nsrc,\n@@ -77,7 +77,7 @@ namespace occa {\nconst CUstream &stream = *((CUstream*) dHandle->currentStream);\nconst bool async = props.get(\"async\", false);\n- if (async) {\n+ if (!async) {\nOCCA_CUDA_ERROR(\"Memory: Copy From\",\ncuMemcpyDtoD(*((CUdeviceptr*) handle) + destOffset,\n*((CUdeviceptr*) src->handle) + srcOffset,\n@@ -98,7 +98,7 @@ namespace occa {\nconst CUstream &stream = *((CUstream*) dHandle->currentStream);\nconst bool async = props.get(\"async\", false);\n- if (async) {\n+ if (!async) {\nOCCA_CUDA_ERROR(\"Memory: Copy From\",\ncuMemcpyDtoH(dest,\n*((CUdeviceptr*) handle) + offset,\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[CUDA] Async copy was backwards, [Linalg] Reduction fix
|
378,349 |
07.03.2017 08:16:01
| 21,600 |
d784deb5d5428fd957580a6e9982d491362d4139
|
[Linalg] Fixed reduction issues, [OKL] Added support for OCCA_USING_<mode> and OCCA_USING_{GPU,CPU} in kernels
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/array/kernels/linalg.okl",
"new_path": "include/occa/array/kernels/linalg.okl",
"diff": "#define GPU_DOT_BLOCK (GPU_DOT_OUTER * GPU_DOT_INNER)\n+#if GPU_DOT_INNER >= (2*256)\n+# define DO_OPER_256 1\n+#else\n+# define DO_OPER_256 0\n+#endif\n+\n+#if GPU_DOT_INNER >= (2*128)\n+# define DO_OPER_128 1\n+#else\n+# define DO_OPER_128 0\n+#endif\n+\n+#if GPU_DOT_INNER >= (2*64)\n+# define DO_OPER_64 1\n+#else\n+# define DO_OPER_64 0\n+#endif\n+\n+#if GPU_DOT_INNER >= (2*32)\n+# define DO_OPER_32 1\n+#else\n+# define DO_OPER_32 0\n+#endif\n+\n+#if GPU_DOT_INNER >= (2*16)\n+# define DO_OPER_16 1\n+#else\n+# define DO_OPER_16 0\n+#endif\n+\n+#if GPU_DOT_INNER >= (2*8)\n+# define DO_OPER_8 1\n+#else\n+# define DO_OPER_8 0\n+#endif\n+\n+#if GPU_DOT_INNER >= (2*4)\n+# define DO_OPER_4 1\n+#else\n+# define DO_OPER_4 0\n+#endif\n+\n+#if GPU_DOT_INNER >= (2*2)\n+# define DO_OPER_2 1\n+#else\n+# define DO_OPER_2 0\n+#endif\n+\n+#if GPU_DOT_INNER >= (2*1)\n+# define DO_OPER_1 1\n+#else\n+# define DO_OPER_1 0\n+#endif\n+\n#define GPU_UNROLLED_DOT_ITER(N, RED_OPERATION) \\\n+ GPU_UNROLLED_DOT_ITER2(DO_OPER_##N, N, RED_OPERATION)\n+\n+#define GPU_UNROLLED_DOT_ITER2(BOOL, N, RED_OPERATION) \\\n+ GPU_UNROLLED_DOT_ITER3(BOOL, N, RED_OPERATION)\n+\n+#define GPU_UNROLLED_DOT_ITER3(BOOL, N, RED_OPERATION) \\\n+ GPU_UNROLLED_DOT_ITER_##BOOL(N, RED_OPERATION)\n+\n+#define GPU_UNROLLED_DOT_ITER_0(N, RED_OPERATION)\n+\n+#define GPU_UNROLLED_DOT_ITER_1(N, RED_OPERATION) \\\nfor (int i = 0; i < GPU_DOT_INNER; ++i; inner) { \\\n- if (GPU_DOT_BLOCK >= (2*N)) { \\\nif (i < N) { \\\nRED_OPERATION(s_red[i], s_red[i + N]); \\\n} \\\n- } \\\n}\n#define GPU_REDUCTION_BODY(INIT, OPERATION, RED_OPERATION) \\\n- for (int oi = 0; oi < (entries + GPU_DOT_OUTER - 1)/GPU_DOT_OUTER; ++oi; outer) { \\\n+ for (int oi = 0; oi < GPU_DOT_OUTER; ++oi; outer) { \\\nshared VTYPE s_red[GPU_DOT_INNER]; \\\n\\\n- for (int i = 0; i < (GPU_DOT_INNER * GPU_DOT_BLOCK); i += GPU_DOT_INNER; inner) { \\\n+ for (int i = 0; i < GPU_DOT_INNER; ++i; inner) { \\\nVTYPE r_red = INIT(oi); \\\n- for (int j = 0; j < GPU_DOT_BLOCK; ++j) { \\\n- if ((oi*GPU_DOT_OUTER + i*GPU_DOT_BLOCK + j) < entries) { \\\n- OPERATION(r_red, oi*GPU_DOT_OUTER + i*GPU_DOT_BLOCK + j); \\\n- } \\\n+ for (int j = (oi*GPU_DOT_INNER + i); j < entries; j += GPU_DOT_BLOCK) { \\\n+ OPERATION(r_red, j); \\\n} \\\ns_red[i] = r_red; \\\n} \\\nGPU_UNROLLED_DOT_ITER(32, RED_OPERATION); \\\nGPU_UNROLLED_DOT_ITER(16, RED_OPERATION); \\\nGPU_UNROLLED_DOT_ITER(8, RED_OPERATION); \\\n+ GPU_UNROLLED_DOT_ITER(4, RED_OPERATION); \\\nGPU_UNROLLED_DOT_ITER(2, RED_OPERATION); \\\nGPU_UNROLLED_DOT_ITER(1, RED_OPERATION); \\\n\\\n#define INIT_ZERO(i) 0\n#define INIT_FIRST(i) vec[0]\n+#define INIT_ABS_FIRST(i) occaFabs(vec[0])\n#define SUM_RED_OPERATION(red, part) \\\nred += part\n-#define ABS_MAX_RED_OPERATION(red, part) \\\n- red = occaFabs(red*red > part*part ? red : part)\n-\n#define MAX_RED_OPERATION(red, part) \\\n- red = red > part ? red : part\n+ const VTYPE r_red2 = red; \\\n+ const VTYPE r_part2 = part; \\\n+ red = r_red2 > r_part2 ? r_red2 : r_part2\n#define MIN_RED_OPERATION(red, part) \\\n- red = red < part ? red : part\n+ const VTYPE r_red2 = red; \\\n+ const VTYPE r_part2 = part; \\\n+ red = r_red2 < r_part2 ? r_red2 : r_part2\nkernel void l1Norm(const int entries,\nconst VTYPE * vec,\n@@ -138,9 +202,12 @@ kernel void lInfNorm(const int entries,\nconst VTYPE * vec,\nRETTYPE * vecReduction) {\n#define LINF_NORM_OPERATION(out, idx) \\\n- const VTYPE vec_i = vec[idx]; \\\n- out = occaFabs(out*out > vec_i*vec_i ? out : vec_i)\n- REDUCTION_BODY(INIT_ZERO, LINF_NORM_OPERATION, ABS_MAX_RED_OPERATION);\n+ const VTYPE vec_i = occaFabs(vec[idx]); \\\n+ if (out < vec_i) { \\\n+ out = vec_i; \\\n+ }\n+\n+ REDUCTION_BODY(INIT_ABS_FIRST, LINF_NORM_OPERATION, MAX_RED_OPERATION);\n}\nkernel void vecMax(const int entries,\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/array/linalg.tpp",
"new_path": "include/occa/array/linalg.tpp",
"diff": "@@ -288,9 +288,9 @@ namespace occa {\nmakeLinalgBuilder<VTYPE, RETTYPE>(\"lInfNorm\");\nRETTYPE *partialReduction = reduce<VTYPE,RETTYPE>(vec, builder, 1024);\n- RETTYPE ret = std::abs(partialReduction[0]);\n+ RETTYPE ret = partialReduction[0];\nfor (int i = 1; i < 1024; ++i) {\n- const RETTYPE abs_i = std::abs(partialReduction[i]);\n+ const RETTYPE abs_i = partialReduction[i];\nif (ret < abs_i) {\nret = abs_i;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/parser/parser.hpp",
"new_path": "include/occa/parser/parser.hpp",
"diff": "@@ -60,7 +60,6 @@ namespace occa {\nbool macrosAreInitialized;\nbool _hasMagicEnabled;\nbool _compilingForCPU;\n- bool _warnForMissingBarriers;\nbool _warnForConditionalBarriers;\nbool _insertBarriersAutomatically;\n//================================\n@@ -84,7 +83,6 @@ namespace occa {\nbool hasMagicEnabled();\nbool compilingForCPU();\n- bool warnForMissingBarriers();\nbool warnForConditionalBarriers();\nbool insertBarriersAutomatically();\n//================================\n@@ -112,6 +110,7 @@ namespace occa {\nconst int parsingLanguage_ = parserInfo::parsingC);\n//====================================\n+ void initModeMacros();\nvoid initMacros(const int parsingLanguage_ = parserInfo::parsingC);\nvoid initFortranMacros();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/device.cpp",
"new_path": "src/device.cpp",
"diff": "@@ -214,11 +214,13 @@ namespace occa {\nkernel_v *&k = ker.kHandle;\nif (usingParser) {\n- k = newModeKernel(occa::properties(\"mode: 'Serial'\"));\n- k->dHandle = newModeDevice(occa::properties(\"mode: 'Serial'\"));\n+ occa::properties launcherProps(\"mode: 'Serial'\");\n+ k = newModeKernel(launcherProps);\n+ k->dHandle = newModeDevice(launcherProps);\nhash_t hash = occa::hashFile(realFilename);\nhash ^= props.hash();\n+ hash ^= occa::hash(mode());\nconst std::string hashDir = io::hashDir(realFilename, hash);\nconst std::string parsedFile = hashDir + \"parsedSource.occa\";\n@@ -229,6 +231,7 @@ namespace occa {\nprops);\nocca::properties launchKernelProps;\n+ launchKernelProps[\"mode\"] = \"Serial\";\nlaunchKernelProps[\"defines/OCCA_LAUNCH_KERNEL\"] = 1;\nk->build(parsedFile,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/parser/parser.cpp",
"new_path": "src/parser/parser.cpp",
"diff": "@@ -77,12 +77,7 @@ namespace occa {\nsetProperties(properties_);\n//---[ Language ]-------\n- if (properties[\"language\"].string() == \"OFL\") {\n- parsingLanguage = parserInfo::parsingFortran;\n- } else {\nparsingLanguage = parserInfo::parsingC;\n- }\n-\npushLanguage(parsingLanguage);\n//---[ Mode ]-----------\n@@ -161,7 +156,6 @@ namespace occa {\n(mode == \"Pthreads\") ||\n(mode == \"OpenMP\"));\n- _warnForMissingBarriers = properties.get(\"warn-for-missing-barriers\" , false);\n_warnForConditionalBarriers = properties.get(\"warn-for-conditional-barriers\", false);\n_insertBarriersAutomatically = properties.get(\"automate-add-barriers\" , true);\n}\n@@ -175,10 +169,6 @@ namespace occa {\n// return _compilingForCPU;\n}\n- bool parserBase::warnForMissingBarriers() {\n- return _warnForMissingBarriers;\n- }\n-\nbool parserBase::warnForConditionalBarriers() {\nreturn _warnForConditionalBarriers;\n}\n@@ -442,9 +432,9 @@ namespace occa {\npos = macros.size();\nmacros.push_back(tmpMacro);\nmacroMap[name] = pos;\n- }\n- else\n+ } else {\npos = macroMap[name];\n+ }\nmacroInfo &info = macros[pos];\ninfo.name = name;\n@@ -640,10 +630,17 @@ namespace occa {\nc = cEnd;\n- if (cStart < (cEnd - 1))\n+ if (cStart < (cEnd - 1)) {\nargs.push_back( std::string(cStart, cEnd - cStart - 1) );\n+ }\n- newLine += info.applyArgs(args);\n+ const int argCount = (int) args.size();\n+ for (int i = 0; i < argCount; ++i) {\n+ applyMacros(args[i]);\n+ }\n+ std::string funcResult = info.applyArgs(args);\n+ applyMacros(funcResult);\n+ newLine += funcResult;\n}\n}\nelse {\n@@ -755,6 +752,8 @@ namespace occa {\n// allExp.print();\n// throw 1;\n+ initModeMacros();\n+\ninitMacros(parsingLanguage_);\npreprocessMacros(allExp);\n@@ -767,6 +766,25 @@ namespace occa {\nreturn allExp;\n}\n//====================================\n+ void parserBase::initModeMacros() {\n+ std::string modes[5] = {\n+ \"SERIAL\", \"OPENMP\", \"OPENCL\", \"CUDA\", \"PTHREADS\",\n+ };\n+ const std::string currentMode = uppercase(properties[\"mode\"].string());\n+ for (int i = 0; i < 5; ++i) {\n+ std::string modeDefine = \"#define OCCA_USING_\";\n+ modeDefine += modes[i];\n+ if (modes[i] != currentMode) {\n+ modeDefine += \" 0\";\n+ } else {\n+ modeDefine += \" 1\";\n+ }\n+ loadMacro(modeDefine);\n+ }\n+\n+ loadMacro(\"#define OCCA_USING_CPU (OCCA_USING_SERIAL || OCCA_USING_OPENMP || OCCA_USING_PTHREADS)\");\n+ loadMacro(\"#define OCCA_USING_GPU (OCCA_USING_OPENCL || OCCA_USING_CUDA)\");\n+ }\nvoid parserBase::initMacros(const int parsingLanguage_) {\nif (parsingLanguage_ & parserInfo::parsingFortran)\n@@ -828,7 +846,7 @@ namespace occa {\nloadMacro(\"#define native\" + cmf + \"(...) occaNative\" + cmf + \"(__VA_ARGS__)\");\n}\n- //---[ CUDA Macros ]----------------\n+ //---[ CUDA Macros ]--------------\nloadMacro(\"#define __global__ occaKernel\");\nloadMacro(\"#define __syncthreads() occaBarrier(occaGlobalMemFence)\");\n@@ -842,7 +860,7 @@ namespace occa {\nloadMacro(\"#define __device__ occaFunction\");\n- //---[ OpenCL Macros ]--------------\n+ //---[ OpenCL Macros ]------------\nloadMacro(\"#define __kernel occaKernel\");\nloadMacro(\"#define CLK_LOCAL_MEM_FENCE occaLocalMemFence\");\n@@ -2065,15 +2083,6 @@ namespace occa {\n}\nif (snPos == lastLoop) {\n- if (warnForMissingBarriers()) {\n- std::cout << \"Warning: Placing a shared-memory barrier between:\\n\"\n- << \"---[ A ]--------------------------------\\n\"\n- << *(firstLoop->value)\n- << \"---[ B ]--------------------------------\\n\"\n- << *(lastLoop->value)\n- << \"========================================\\n\";\n- }\n-\ns.pushSourceLeftOf(lastLoop, \"occaBarrier(occaLocalMemFence);\");\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/io.cpp",
"new_path": "src/tools/io.cpp",
"diff": "@@ -419,11 +419,6 @@ namespace occa {\nparser fileParser;\nproperties[\"mode\"] = deviceMode;\n- properties[\"language\"] = ((ext != \"ofl\") ? \"C\" : \"Fortran\");\n-\n- if ((ext == \"oak\") || (ext == \"oaf\")) {\n- properties[\"magic\"] = \"enabled\";\n- }\nstd::string parsedContent = fileParser.parseFile(io::filename(filename), properties);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Linalg] Fixed reduction issues, [OKL] Added support for OCCA_USING_<mode> and OCCA_USING_{GPU,CPU} in kernels
|
378,349 |
11.03.2017 08:48:47
| 21,600 |
8ca3547feca2bd7b0cd8cb3b6ba8020e7d6d4ae0
|
[Core] Removed OFL from API, [Parser] Fixed preprocessor2's error and warning ^ placement
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "[](https://gitter.im/libocca/occa?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)\nOCCA is an open-source (MIT license) library used to program current multi-core/many-core architectures.\n-Devices (such as CPUs, GPUs, Intel's Xeon Phi, FPGAs, etc) are abstracted using an offload-model for application development and programming for the devices is done through a C-based (OKL) or Fortran-based kernel language (OFL).\n+Devices (such as CPUs, GPUs, Intel's Xeon Phi, FPGAs, etc) are abstracted using an offload-model for application development and programming for the devices is done through a C-based (OKL) kernel.\nOCCA gives developers the ability to target devices at run-time by using run-time compilation for device kernels.\n## Installing\n@@ -26,12 +26,6 @@ cd occa\nmake -j 4\n```\n-To compile the Fortran library, setup the `OCCA_FORTRAN_ENABLED` environment variable before compiling\n-\n-```bash\n-export OCCA_FORTRAN_ENABLED=\"1\"\n-```\n-\nPython 2 and 3 bindings are also available.\nIf you wish to setup the occa Python module\n@@ -47,8 +41,6 @@ We have a few examples to show different features of OCCA. The addVectors exampl\n* C++\n* C\n* Python\n-* Fortran\n-* Julia\n### Compile\nTo compile addVectors (Hello World! style example) in C++\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/defines.hpp",
"new_path": "include/occa/defines.hpp",
"diff": "//======================================\n-//---[ Constants ]----------------------\n-#define OCCA_CONST_IR (1 << 0)\n-#define OCCA_CONST_OKL (1 << 1)\n-#define OCCA_CONST_OFL (1 << 2)\n-//======================================\n-\n-\n//---[ OpenCL ]-------------------------\n#define OCCA_OPENCL_TEMPLATE_CHECK(checkFunction, expr, filename, function, line, message) \\\ndo { \\\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/lang/c/c_wrapper.hpp",
"new_path": "include/occa/lang/c/c_wrapper.hpp",
"diff": "@@ -69,13 +69,6 @@ typedef struct {\noccaUDim_t x, y, z;\n} occaDim;\n-typedef enum {\n- IR = OCCA_CONST_IR,\n- OKL = OCCA_CONST_OKL,\n- OFL = OCCA_CONST_OFL\n-} occaLanguage;\n-\n-\n//---[ Globals & Flags ]----------------\nextern OCCA_LFUNC const occaObject occaDefault;\nextern OCCA_LFUNC const occaUDim_t occaAllBytes;\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/io.hpp",
"new_path": "include/occa/tools/io.hpp",
"diff": "@@ -134,8 +134,6 @@ namespace occa {\nvoid releaseHash(const hash_t &hash, const std::string &tag);\nvoid releaseHashLock(const std::string &lockDir);\n- bool fileNeedsParser(const std::string &filename);\n-\nkernelMetadata parseFileForFunction(const std::string &deviceMode,\nconst std::string &filename,\nconst std::string &cachedBinary,\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/include/preprocessor.hpp",
"new_path": "parser_sandbox/include/preprocessor.hpp",
"diff": "@@ -19,7 +19,7 @@ namespace occa {\nclass preprocessor_t {\npublic:\n- typedef void (preprocessor_t::*processDirective_t)(char *&c);\n+ typedef void (preprocessor_t::*processDirective_t)(char *&dStart, char *&c);\ntypedef trie_t<processDirective_t> directiveTrie_t;\nstatic const std::string macroEndDelimiters;\n@@ -108,23 +108,23 @@ namespace occa {\nvoid applyMacros(char *c, const size_t chars, std::string &out);\nvoid processDirective(char *&c);\n- void processIf(char *&c);\n- void processIfdef(char *&c);\n- void processIfndef(char *&c);\n- void processElif(char *&c);\n- void processElse(char *&c);\n- void processEndif(char *&c);\n+ void processIf(char *&dStart, char *&c);\n+ void processIfdef(char *&dStart, char *&c);\n+ void processIfndef(char *&dStart, char *&c);\n+ void processElif(char *&dStart, char *&c);\n+ void processElse(char *&dStart, char *&c);\n+ void processEndif(char *&dStart, char *&c);\n- void processDefine(char *&c);\n- void processUndef(char *&c);\n+ void processDefine(char *&dStart, char *&c);\n+ void processUndef(char *&dStart, char *&c);\nvoid processMessage(char *&c, const bool isError);\n- void processError(char *&c);\n- void processWarning(char *&c);\n+ void processError(char *&dStart, char *&c);\n+ void processWarning(char *&dStart, char *&c);\n- void processInclude(char *&c);\n- void processPragma(char *&c);\n- void processLine(char *&c);\n+ void processInclude(char *&dStart, char *&c);\n+ void processPragma(char *&dStart, char *&c);\n+ void processLine(char *&dStart, char *&c);\n//---[ Messages ]-------------------\nvoid printMessage(const std::string &message,\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/src/preprocessor.cpp",
"new_path": "parser_sandbox/src/preprocessor.cpp",
"diff": "@@ -292,13 +292,13 @@ namespace occa {\n(strncmp(cStart, \"if\" , 2) &&\nstrncmp(cStart, \"el\" , 2) &&\nstrncmp(cStart, \"end\", 3))) {\n- (this->*(result.value()))(c);\n+ (this->*(result.value()))(cStart, c);\n} else {\nupdatingSkipTo(c, '\\n');\n}\n}\n- void preprocessor_t::processIf(char *&c) {\n+ void preprocessor_t::processIf(char *&dStart, char *&c) {\nchar *cStart = c;\nupdatingSkipTo(c, '\\n');\n@@ -314,7 +314,7 @@ namespace occa {\nstatus |= finishedIf;\n}\n- void preprocessor_t::processIfdef(char *&c) {\n+ void preprocessor_t::processIfdef(char *&dStart, char *&c) {\nchar *cStart = c;\nupdatingSkipTo(c, '\\n');\n@@ -331,8 +331,8 @@ namespace occa {\nstatus |= (macro != NULL) ? ignoring : finishedIf;\n}\n- void preprocessor_t::processIfndef(char *&c) {\n- processIfdef(c);\n+ void preprocessor_t::processIfndef(char *&dStart, char *&c) {\n+ processIfdef(dStart, c);\nint &status = currentStatus.status;\n// Ifdef already set finishedIf so we can return\nif (status & ignoring) {\n@@ -342,11 +342,11 @@ namespace occa {\nstatus ^= finishedIf;\n}\n- void preprocessor_t::processElif(char *&c) {\n- processIf(c);\n+ void preprocessor_t::processElif(char *&dStart, char *&c) {\n+ processIf(dStart, c);\n}\n- void preprocessor_t::processElse(char *&c) {\n+ void preprocessor_t::processElse(char *&dStart, char *&c) {\nint &status = currentStatus.status;\nif (status & finishedIf) {\nupdatingSkipTo(c, '\\n');\n@@ -355,7 +355,7 @@ namespace occa {\nstatus |= finishedIf;\n}\n- void preprocessor_t::processEndif(char *&c) {\n+ void preprocessor_t::processEndif(char *&dStart, char *&c) {\nconst char *cStart = c;\nupdatingSkipTo(c, '\\n');\n@@ -367,7 +367,7 @@ namespace occa {\nstatusStack.pop_back();\n}\n- void preprocessor_t::processDefine(char *&c) {\n+ void preprocessor_t::processDefine(char *&dStart, char *&c) {\nconst int thisLineNumber = currentFrame.lineNumber;\nchar *cStart = c;\nupdatingSkipTo(c, '\\n');\n@@ -381,7 +381,7 @@ namespace occa {\nsourceMacros.add(macro->name, macro);\n}\n- void preprocessor_t::processUndef(char *&c) {\n+ void preprocessor_t::processUndef(char *&dStart, char *&c) {\nconst int thisLineNumber = currentFrame.lineNumber;\nchar *cStart = c;\nupdatingSkipToWhitespace(c);\n@@ -410,15 +410,15 @@ namespace occa {\n}\n}\n- void preprocessor_t::processError(char *&c) {\n- processMessage(c, true);\n+ void preprocessor_t::processError(char *&dStart, char *&c) {\n+ processMessage(dStart, true);\n}\n- void preprocessor_t::processWarning(char *&c) {\n- processMessage(c, false);\n+ void preprocessor_t::processWarning(char *&dStart, char *&c) {\n+ processMessage(dStart, false);\n}\n- void preprocessor_t::processInclude(char *&c) {\n+ void preprocessor_t::processInclude(char *&dStart, char *&c) {\nchar *cStart = c;\nupdatingSkipTo(c, '\\n');\n@@ -429,11 +429,11 @@ namespace occa {\nprocessFile(io::filename(line));\n}\n- void preprocessor_t::processPragma(char *&c) {\n+ void preprocessor_t::processPragma(char *&dStart, char *&c) {\nupdatingSkipTo(c, '\\n');\n}\n- void preprocessor_t::processLine(char *&c) {\n+ void preprocessor_t::processLine(char *&dStart, char *&c) {\nchar *cStart = c;\nupdatingSkipTo(c, '\\n');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/device.cpp",
"new_path": "src/device.cpp",
"diff": "@@ -204,24 +204,22 @@ namespace occa {\nkernel device::buildKernel(const std::string &filename,\nconst std::string &kernelName,\nconst occa::properties &props) {\n+\nocca::properties allProps = properties() + props;\nconst std::string realFilename = io::filename(filename);\n- const bool usingParser = io::fileNeedsParser(filename);\n- kernel ker;\n+ hash_t hash = occa::hashFile(realFilename);\n+ hash ^= props.hash();\n+ hash ^= occa::hash(mode());\n+ kernel ker;\nkernel_v *&k = ker.kHandle;\n- if (usingParser) {\nocca::properties launcherProps(\"mode: 'Serial'\");\nk = newModeKernel(launcherProps);\nk->dHandle = newModeDevice(launcherProps);\n- hash_t hash = occa::hashFile(realFilename);\n- hash ^= props.hash();\n- hash ^= occa::hash(mode());\n-\nconst std::string hashDir = io::hashDir(realFilename, hash);\nconst std::string parsedFile = hashDir + \"parsedSource.occa\";\nk->metadata = io::parseFileForFunction(mode(),\n@@ -266,12 +264,6 @@ namespace occa {\n}\nsettings()[\"verboseCompilation\"] = vc_f;\n}\n- } else {\n- k = dHandle->buildKernel(realFilename,\n- kernelName,\n- allProps);\n- k->dHandle = dHandle;\n- }\nreturn ker;\n}\n@@ -287,15 +279,7 @@ namespace occa {\nconst std::string hashTag = \"occa-device\";\nstd::string stringSourceFile = hashDir;\n- const std::string language = allProps.get<std::string>(\"language\", \"OKL\");\n-\n- if (language == \"OCCA\") {\n- stringSourceFile += \"stringSource.occa\";\n- } else if (language == \"OFL\") {\n- stringSourceFile += \"stringSource.ofl\";\n- } else {\nstringSourceFile += \"stringSource.okl\";\n- }\nif (!io::haveHash(hash, hashTag)) {\nio::waitForHash(hash, hashTag);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/io.cpp",
"new_path": "src/tools/io.cpp",
"diff": "@@ -399,15 +399,6 @@ namespace occa {\nfileLocks.erase(lockDir);\n}\n- bool fileNeedsParser(const std::string &filename) {\n- std::string ext = io::extension(filename);\n-\n- return ((ext == \"okl\") ||\n- (ext == \"ofl\") ||\n- (ext == \"cl\") ||\n- (ext == \"cu\"));\n- }\n-\nkernelMetadata parseFileForFunction(const std::string &deviceMode,\nconst std::string &filename,\nconst std::string &parsedFile,\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Core] Removed OFL from API, [Parser] Fixed preprocessor2's error and warning ^ placement
|
378,349 |
12.03.2017 00:22:51
| 21,600 |
db2a7a7dd81e337077e027cfa254fcb57c3db830
|
[Parser] Adding lang types
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "parser_sandbox/include/type.hpp",
"diff": "+#ifndef OCCA_PARSER_TYPE_HEADER2\n+#define OCCA_PARSER_TYPE_HEADER2\n+\n+#include <ostream>\n+#include <vector>\n+#include <map>\n+\n+#include \"occa/defines.hpp\"\n+#include \"occa/types.hpp\"\n+\n+namespace occa {\n+ namespace lang {\n+ class qualifier;\n+ typedef std::vector<const qualifier*> qualifierVec_t;\n+\n+ //---[ Specifier ]------------------\n+ class specifier {\n+ public:\n+ std::string name;\n+ int specType;\n+\n+ static const int qualifierType = (1 << 0);\n+ static const int functionType = (1 << 1);\n+ static const int storageType = (1 << 2);\n+ static const int variableType = (1 << 3);\n+ static const int primitiveType = (1 << 4);\n+ static const int definedType = (1 << 5);\n+\n+ specifier(const int specType_);\n+\n+ specifier(const std::string &name_, const int specType_);\n+\n+ virtual ~specifier();\n+\n+ inline bool isNamed() const {\n+ return (name.size() != 0);\n+ }\n+\n+ inline bool isUnnamed() const {\n+ return (name.size() == 0);\n+ }\n+\n+ inline std::string toString() const {\n+ std::string s;\n+ printOn(s);\n+ return s;\n+ }\n+\n+ virtual void printOn(std::string &out) const;\n+ };\n+\n+ std::ostream& operator << (std::ostream &out, const specifier &s);\n+\n+ //---[ Qualifier ]------------------\n+ class qualifier : public specifier {\n+ public:\n+ qualifier(const std::string &name_);\n+\n+ qualifier(const std::string &name_, const int specType_);\n+\n+ virtual ~qualifier();\n+ };\n+\n+ //---[ Qualifiers ]-----------------\n+ class qualifiers {\n+ public:\n+ qualifierVec_t qualifierVec;\n+\n+ qualifiers();\n+\n+ qualifiers(const qualifier &q);\n+\n+ ~qualifiers();\n+\n+ inline int size() const {\n+ return (int) qualifierVec.size();\n+ }\n+\n+ int has(const qualifier &q);\n+ void add(const qualifier &q);\n+ void remove(const qualifier &q);\n+\n+ std::string toString() const;\n+\n+ void printOn(std::string &out) const;\n+ };\n+\n+ std::ostream& operator << (std::ostream &out, const qualifiers &qs);\n+\n+ //---[ Type ]-----------------------\n+ class type : public specifier {\n+ public:\n+ const type *baseType;\n+ qualifiers qualifiers_;\n+\n+ type();\n+ type(const std::string &name_);\n+ type(const std::string &name_, const int specType_);\n+\n+ type(const type &baseType_);\n+ type(const qualifiers &qs);\n+ type(const qualifiers &qs, const type &baseType_);\n+\n+ virtual ~type();\n+\n+ virtual type& clone() const;\n+\n+ inline void add(const qualifier &q) {\n+ qualifiers_.add(q);\n+ }\n+\n+ inline void remove(const qualifier &q) {\n+ qualifiers_.remove(q);\n+ }\n+\n+ inline bool has(const qualifier &q) {\n+ return qualifiers_.has(q) >= 0;\n+ }\n+\n+ virtual void printOn(std::string &out) const;\n+ };\n+\n+ //---[ Primitive ]------------------\n+ class primitive : public type {\n+ public:\n+ primitive(const std::string &name_);\n+\n+ virtual ~primitive();\n+\n+ virtual type& clone() const;\n+ };\n+\n+ //---[ Pointer ]--------------------\n+ class pointer : public type {\n+ public:\n+ pointer(const type &t);\n+ pointer(const qualifiers &qs);\n+ pointer(const qualifiers &qs, const type &t);\n+\n+ virtual ~pointer();\n+\n+ virtual type& clone() const;\n+\n+ virtual void printOn(std::string &out) const;\n+ };\n+\n+ //---[ Typedef ]--------------------\n+ class typedefType : public type {\n+ virtual ~typedefType();\n+\n+ virtual type& clone() const;\n+ };\n+\n+ //---[ Class ]----------------------\n+ class classType : public type {\n+ virtual ~classType();\n+\n+ virtual type& clone() const;\n+ };\n+ }\n+}\n+#endif\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "parser_sandbox/include/typeBuiltins.hpp",
"diff": "+#ifndef OCCA_PARSER_TYPEBUILTINS_HEADER2\n+#define OCCA_PARSER_TYPEBUILTINS_HEADER2\n+\n+#include \"type.hpp\"\n+\n+namespace occa {\n+ namespace lang {\n+ extern const qualifier const_;\n+ extern const qualifier constexpr_;\n+ extern const qualifier friend_;\n+ extern const qualifier typedef_;\n+ extern const qualifier signed_;\n+ extern const qualifier unsigned_;\n+ extern const qualifier volatile_;\n+\n+ extern const qualifier extern_;\n+ extern const qualifier mutable_;\n+ extern const qualifier register_;\n+ extern const qualifier static_;\n+ extern const qualifier thread_local_;\n+\n+ extern const qualifier explicit_;\n+ extern const qualifier inline_;\n+ extern const qualifier virtual_;\n+\n+ extern const qualifier class_;\n+ extern const qualifier enum_;\n+ extern const qualifier struct_;\n+ extern const qualifier union_;\n+\n+ extern const primitive bool_;\n+ extern const primitive char_;\n+ extern const primitive char16_t_;\n+ extern const primitive char32_t_;\n+ extern const primitive wchar_t_;\n+ extern const primitive short_;\n+ extern const primitive int_;\n+ extern const primitive long_;\n+ extern const primitive float_;\n+ extern const primitive double_;\n+ extern const primitive void_;\n+ extern const primitive auto_;\n+ }\n+}\n+#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/notes.org",
"new_path": "parser_sandbox/notes.org",
"diff": "@@ -123,12 +123,3 @@ statement\nnew variables\ngetNamespace()\n-* Misc\n-\n-0 libocca.so 0x000000010de01550 _ZN4occa3sys15printStacktraceEv + 32\n-1 libocca.so 0x000000010de01e07 _ZN4occa8_messageERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEbS8_S8_iS8_ + 2103\n-2 libocca.so 0x000000010ddf4ac9 _ZN4occa5errorERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_iS8_ + 185\n-3 testTrie 0x000000010db92996 _ZN4occa7testing7compareIbEEvRKT_S4_ + 1942\n-4 testTrie 0x000000010db91ee2 _Z10testSearchRN4occa6trie_tE + 50\n-5 testTrie 0x000000010db91dd9 main + 57\n-6 libdyld.dylib 0x00007fffb0357255 start + 1\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "parser_sandbox/src/type.cpp",
"diff": "+#include \"type.hpp\"\n+\n+namespace occa {\n+ namespace lang {\n+ //---[ Specifier ]------------------\n+ specifier::specifier(const int specType_) :\n+ name(),\n+ specType(specType_) {}\n+\n+ specifier::specifier(const std::string &name_, const int specType_) :\n+ name(name_),\n+ specType(specType_) {}\n+\n+ specifier::~specifier() {}\n+\n+ void specifier::printOn(std::string &out) const {\n+ out += name;\n+ }\n+\n+ std::ostream& operator << (std::ostream &out, const specifier &s) {\n+ out << s.toString();\n+ return out;\n+ }\n+\n+ //---[ Qualifier ]------------------\n+ qualifier::qualifier(const std::string &name_) :\n+ specifier(name_, specifier::qualifierType) {}\n+\n+ qualifier::qualifier(const std::string &name_, const int specType_) :\n+ specifier(name_, specType_) {}\n+\n+ qualifier::~qualifier() {}\n+\n+ //---[ Qualifiers ]-----------------\n+ qualifiers::qualifiers() {}\n+\n+ qualifiers::qualifiers(const qualifier &q) {\n+ add(q);\n+ }\n+\n+ qualifiers::~qualifiers() {}\n+\n+ int qualifiers::has(const qualifier &q) {\n+ const int count = (int) qualifierVec.size();\n+ if (count) {\n+ const qualifier **qs = &(qualifierVec[0]);\n+ for (int i = 0; i < count; ++i) {\n+ if (qs[i] == &q) {\n+ return i;\n+ }\n+ }\n+ }\n+ return -1;\n+ }\n+\n+ void qualifiers::add(const qualifier &q) {\n+ qualifierVec.push_back(&q);\n+ }\n+\n+ void qualifiers::remove(const qualifier &q) {\n+ const int idx = has(q);\n+ if (idx >= 0) {\n+ qualifierVec.erase(qualifierVec.begin() + idx);\n+ }\n+ }\n+\n+ std::string qualifiers::toString() const {\n+ std::string s;\n+ printOn(s);\n+ return s;\n+ }\n+\n+ void qualifiers::printOn(std::string &out) const {\n+ const int count = (int) qualifierVec.size();\n+ if (!count) {\n+ return;\n+ }\n+\n+ qualifierVec[0]->printOn(out);\n+ for (int i = 1; i < count; ++i) {\n+ out += ' ';\n+ qualifierVec[i]->printOn(out);\n+ }\n+ }\n+\n+ std::ostream& operator << (std::ostream &out, const qualifiers &qs) {\n+ out << qs.toString();\n+ return out;\n+ }\n+\n+ //---[ Type ]-----------------------\n+ type::type() :\n+ specifier(specifier::definedType),\n+ baseType(NULL) {}\n+\n+ type::type(const std::string &name_) :\n+ specifier(name_, specifier::definedType),\n+ baseType(NULL) {}\n+\n+ type::type(const std::string &name_,\n+ const int specType_) :\n+ specifier(name_, specType_),\n+ baseType(NULL) {}\n+\n+ type::type(const type &baseType_) :\n+ specifier(specifier::definedType),\n+ baseType(&(baseType_.clone())) {}\n+\n+ type::type(const qualifiers &qs) :\n+ specifier(specifier::definedType),\n+ baseType(NULL),\n+ qualifiers_(qs) {}\n+\n+ type::type(const qualifiers &qs, const type &baseType_) :\n+ specifier(specifier::definedType),\n+ baseType(&(baseType_.clone())),\n+ qualifiers_(qs) {}\n+\n+ type::~type() {\n+ if (baseType && baseType->isUnnamed()) {\n+ delete baseType;\n+ }\n+ }\n+\n+ type& type::clone() const {\n+ if (isNamed()) {\n+ return *(const_cast<type*>(this));\n+ }\n+ if (baseType) {\n+ return *(new type(qualifiers_, baseType->clone()));\n+ }\n+ return *(new type(qualifiers_));\n+ }\n+\n+ void type::printOn(std::string &out) const {\n+ if (qualifiers_.size()) {\n+ qualifiers_.printOn(out);\n+ if (baseType || isNamed()) {\n+ out += ' ';\n+ }\n+ }\n+ if (baseType) {\n+ baseType->printOn(out);\n+ } else {\n+ out += name;\n+ }\n+ }\n+\n+ //---[ Primitive ]------------------\n+ primitive::primitive(const std::string &name_) :\n+ type(name_, specifier::primitiveType) {}\n+\n+ primitive::~primitive() {}\n+\n+ type& primitive::clone() const {\n+ return *(const_cast<primitive*>(this));\n+ }\n+\n+ //---[ Pointer ]--------------------\n+ pointer::pointer(const type &t) :\n+ type(t) {}\n+\n+ pointer::pointer(const qualifiers &qs) :\n+ type(qs) {}\n+\n+ pointer::pointer(const qualifiers &qs, const type &t) :\n+ type(qs, t) {}\n+\n+ pointer::~pointer() {}\n+\n+ type& pointer::clone() const {\n+ if (baseType) {\n+ return *(new pointer(qualifiers_, baseType->clone()));\n+ }\n+ return *(new pointer(qualifiers_));\n+ }\n+\n+ void pointer::printOn(std::string &out) const {\n+ if (!baseType) {\n+ return;\n+ }\n+ baseType->printOn(out);\n+ out += \" *\";\n+ if (qualifiers_.size()) {\n+ out += ' ';\n+ qualifiers_.printOn(out);\n+ }\n+ }\n+\n+ //---[ Typedef ]--------------------\n+ typedefType::~typedefType() {}\n+\n+ type& typedefType::clone() const {\n+ return *(const_cast<typedefType*>(this));\n+ }\n+\n+ //---[ Class ]----------------------\n+ classType::~classType() {}\n+\n+ type& classType::clone() const {\n+ return *(const_cast<classType*>(this));\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "parser_sandbox/src/typeBuiltins.cpp",
"diff": "+#include \"typeBuiltins.hpp\"\n+\n+namespace occa {\n+ namespace lang {\n+ const qualifier const_ (\"const\");\n+ const qualifier constexpr_ (\"constexpr\");\n+ const qualifier friend_ (\"friend\");\n+ const qualifier typedef_ (\"typedef\");\n+ const qualifier signed_ (\"signed\");\n+ const qualifier unsigned_ (\"unsigned\");\n+ const qualifier volatile_ (\"volatile\");\n+\n+ const qualifier extern_ (\"extern\" , specifier::storageType);\n+ const qualifier mutable_ (\"mutable\" , specifier::storageType);\n+ const qualifier register_ (\"register\" , specifier::storageType);\n+ const qualifier static_ (\"static\" , specifier::storageType);\n+ const qualifier thread_local_ (\"thread_local\", specifier::storageType);\n+\n+ const qualifier explicit_ (\"explicit\", specifier::functionType);\n+ const qualifier inline_ (\"inline\" , specifier::functionType);\n+ const qualifier virtual_ (\"virtual\" , specifier::functionType);\n+\n+ const qualifier class_ (\"class\" , specifier::variableType);\n+ const qualifier enum_ (\"enum\" , specifier::variableType);\n+ const qualifier struct_ (\"struct\", specifier::variableType);\n+ const qualifier union_ (\"union\" , specifier::variableType);\n+\n+ const primitive bool_ (\"bool\");\n+ const primitive char_ (\"char\");\n+ const primitive char16_t_ (\"char16_t\");\n+ const primitive char32_t_ (\"char32_t\");\n+ const primitive wchar_t_ (\"wchar_t\");\n+ const primitive short_ (\"short\");\n+ const primitive int_ (\"int\");\n+ const primitive long_ (\"long\");\n+ const primitive float_ (\"float\");\n+ const primitive double_ (\"double\");\n+ const primitive void_ (\"void\");\n+ const primitive auto_ (\"auto\");\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "parser_sandbox/tests/testFunction.cpp",
"diff": "+#include \"occa/tools/env.hpp\"\n+#include \"occa/tools/testing.hpp\"\n+\n+#include \"type.hpp\"\n+#include \"typeBuiltins.hpp\"\n+\n+void testFunction();\n+\n+int main(const int argc, const char **argv) {\n+ testFunction();\n+}\n+\n+using namespace occa::lang;\n+\n+void testFunction() {\n+ qualifiers q1;\n+ q1.add(volatile_);\n+\n+ type &t1_0 = float_.clone();\n+ t1_0.add(const_);\n+ pointer t1_1(q1, t1_0);\n+ pointer t1(const_, t1_1);\n+ pointer t2(t1_1);\n+ // typedefType t2 = typedefType(const_, double_, \"t2\");\n+\n+ // function f(void_, \"foo\");\n+ // f.addArgument(t1, \"a\");\n+ // f.addArgument(t2, \"b\");\n+\n+ std::cout << \"q1 = \" << q1 << '\\n'\n+ << \"t1_0 = \" << t1_0 << '\\n'\n+ << \"t1_1 = \" << t1_1 << '\\n'\n+ << \"t1 = \" << t1 << '\\n'\n+ << \"t2 = \" << t2 << '\\n';\n+\n+ // std::cout << \"q1 = \" << q1 << '\\n'\n+ // << \"t1_1 = \" << t1_1 << '\\n'\n+ // << \"t1 = \" << t1 << '\\n'\n+ // << \"t2 = \" << t2 << '\\n'\n+ // << \"f = \" << f << '\\n';\n+}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Parser] Adding lang types
|
378,349 |
12.03.2017 01:15:56
| 21,600 |
c06491e022acad991b63eae546c695949247a600
|
[Parser] Added reference and typedefType
|
[
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/include/type.hpp",
"new_path": "parser_sandbox/include/type.hpp",
"diff": "@@ -27,9 +27,7 @@ namespace occa {\nstatic const int definedType = (1 << 5);\nspecifier(const int specType_);\n-\nspecifier(const std::string &name_, const int specType_);\n-\nvirtual ~specifier();\ninline bool isNamed() const {\n@@ -55,9 +53,7 @@ namespace occa {\nclass qualifier : public specifier {\npublic:\nqualifier(const std::string &name_);\n-\nqualifier(const std::string &name_, const int specType_);\n-\nvirtual ~qualifier();\n};\n@@ -67,9 +63,7 @@ namespace occa {\nqualifierVec_t qualifierVec;\nqualifiers();\n-\nqualifiers(const qualifier &q);\n-\n~qualifiers();\ninline int size() const {\n@@ -97,9 +91,9 @@ namespace occa {\ntype(const std::string &name_);\ntype(const std::string &name_, const int specType_);\n- type(const type &baseType_);\n- type(const qualifiers &qs);\n- type(const qualifiers &qs, const type &baseType_);\n+ type(const type &baseType_, const std::string &name_ = \"\");\n+ type(const qualifiers &qs, const std::string &name_ = \"\");\n+ type(const qualifiers &qs, const type &baseType_, const std::string &name_ = \"\");\nvirtual ~type();\n@@ -124,7 +118,6 @@ namespace occa {\nclass primitive : public type {\npublic:\nprimitive(const std::string &name_);\n-\nvirtual ~primitive();\nvirtual type& clone() const;\n@@ -134,9 +127,7 @@ namespace occa {\nclass pointer : public type {\npublic:\npointer(const type &t);\n- pointer(const qualifiers &qs);\npointer(const qualifiers &qs, const type &t);\n-\nvirtual ~pointer();\nvirtual type& clone() const;\n@@ -144,11 +135,27 @@ namespace occa {\nvirtual void printOn(std::string &out) const;\n};\n+ //---[ Reference ]------------------\n+ class reference : public type {\n+ public:\n+ reference(const type &t);\n+ virtual ~reference();\n+\n+ virtual type& clone() const;\n+\n+ virtual void printOn(std::string &out) const;\n+ };\n+\n//---[ Typedef ]--------------------\nclass typedefType : public type {\n+ public:\n+ typedefType(const type &t, const std::string &name_);\n+ typedefType(const qualifiers &qs, const type &t, const std::string &name_);\nvirtual ~typedefType();\nvirtual type& clone() const;\n+\n+ virtual void printOn(std::string &out) const;\n};\n//---[ Class ]----------------------\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/src/type.cpp",
"new_path": "parser_sandbox/src/type.cpp",
"diff": "+#include <sstream>\n+\n+#include \"occa/defines.hpp\"\n+#include \"occa/tools/sys.hpp\"\n+\n#include \"type.hpp\"\nnamespace occa {\n@@ -102,17 +107,17 @@ namespace occa {\nspecifier(name_, specType_),\nbaseType(NULL) {}\n- type::type(const type &baseType_) :\n- specifier(specifier::definedType),\n+ type::type(const type &baseType_, const std::string &name_) :\n+ specifier(name_, specifier::definedType),\nbaseType(&(baseType_.clone())) {}\n- type::type(const qualifiers &qs) :\n- specifier(specifier::definedType),\n+ type::type(const qualifiers &qs, const std::string &name_) :\n+ specifier(name_, specifier::definedType),\nbaseType(NULL),\nqualifiers_(qs) {}\n- type::type(const qualifiers &qs, const type &baseType_) :\n- specifier(specifier::definedType),\n+ type::type(const qualifiers &qs, const type &baseType_, const std::string &name_) :\n+ specifier(name_, specifier::definedType),\nbaseType(&(baseType_.clone())),\nqualifiers_(qs) {}\n@@ -160,25 +165,20 @@ namespace occa {\npointer::pointer(const type &t) :\ntype(t) {}\n- pointer::pointer(const qualifiers &qs) :\n- type(qs) {}\n-\npointer::pointer(const qualifiers &qs, const type &t) :\ntype(qs, t) {}\npointer::~pointer() {}\ntype& pointer::clone() const {\n- if (baseType) {\n+ OCCA_ERROR(\"occa::lang::pointer has a NULL baseType\",\n+ baseType);\nreturn *(new pointer(qualifiers_, baseType->clone()));\n}\n- return *(new pointer(qualifiers_));\n- }\nvoid pointer::printOn(std::string &out) const {\n- if (!baseType) {\n- return;\n- }\n+ OCCA_ERROR(\"occa::lang::pointer has a NULL baseType\",\n+ baseType);\nbaseType->printOn(out);\nout += \" *\";\nif (qualifiers_.size()) {\n@@ -187,13 +187,56 @@ namespace occa {\n}\n}\n+ //---[ Reference ]--------------------\n+ reference::reference(const type &t) :\n+ type(t) {}\n+\n+ reference::~reference() {}\n+\n+ type& reference::clone() const {\n+ OCCA_ERROR(\"occa::lang::reference has a NULL baseType\",\n+ baseType);\n+ return *(new reference(baseType->clone()));\n+ }\n+\n+ void reference::printOn(std::string &out) const {\n+ OCCA_ERROR(\"occa::lang::reference has a NULL baseType\",\n+ baseType);\n+ baseType->printOn(out);\n+ out += \" &\";\n+ if (qualifiers_.size()) {\n+ out += ' ';\n+ qualifiers_.printOn(out);\n+ }\n+ }\n+\n//---[ Typedef ]--------------------\n+ typedefType::typedefType(const type &t, const std::string &name_) :\n+ type(t, name_) {}\n+\n+ typedefType::typedefType(const qualifiers &qs, const type &t, const std::string &name_) :\n+ type(qs, t, name_) {}\n+\ntypedefType::~typedefType() {}\ntype& typedefType::clone() const {\nreturn *(const_cast<typedefType*>(this));\n}\n+ void typedefType::printOn(std::string &out) const {\n+ if (!baseType) {\n+ return;\n+ }\n+ out += \"typedef \";\n+ if (qualifiers_.size()) {\n+ qualifiers_.printOn(out);\n+ out += ' ';\n+ }\n+ baseType->printOn(out);\n+ out += ' ';\n+ out += name;\n+ }\n+\n//---[ Class ]----------------------\nclassType::~classType() {}\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/tests/testFunction.cpp",
"new_path": "parser_sandbox/tests/testFunction.cpp",
"diff": "@@ -16,12 +16,13 @@ void testFunction() {\nqualifiers q1;\nq1.add(volatile_);\n- type &t1_0 = float_.clone();\n+ type t1_0(float_);\nt1_0.add(const_);\npointer t1_1(q1, t1_0);\n- pointer t1(const_, t1_1);\n- pointer t2(t1_1);\n- // typedefType t2 = typedefType(const_, double_, \"t2\");\n+ reference t1(t1_1);\n+ pointer t2(const_, t1_1);\n+ typedefType td1 = typedefType(t1, \"t1\");\n+ typedefType td2 = typedefType(t2, \"t2\");\n// function f(void_, \"foo\");\n// f.addArgument(t1, \"a\");\n@@ -31,11 +32,7 @@ void testFunction() {\n<< \"t1_0 = \" << t1_0 << '\\n'\n<< \"t1_1 = \" << t1_1 << '\\n'\n<< \"t1 = \" << t1 << '\\n'\n- << \"t2 = \" << t2 << '\\n';\n-\n- // std::cout << \"q1 = \" << q1 << '\\n'\n- // << \"t1_1 = \" << t1_1 << '\\n'\n- // << \"t1 = \" << t1 << '\\n'\n- // << \"t2 = \" << t2 << '\\n'\n- // << \"f = \" << f << '\\n';\n+ << \"t2 = \" << t2 << '\\n'\n+ << \"td1 = \" << td1 << '\\n'\n+ << \"td2 = \" << td2 << '\\n';\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Parser] Added reference and typedefType
|
378,349 |
12.03.2017 03:17:00
| 18,000 |
ad5f3fa276f57cfa1de2fe4a3e77cfba838bb3e1
|
[Parser] Added function
|
[
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/include/type.hpp",
"new_path": "parser_sandbox/include/type.hpp",
"diff": "namespace occa {\nnamespace lang {\nclass qualifier;\n+ class type;\n+\ntypedef std::vector<const qualifier*> qualifierVec_t;\n+ typedef std::vector<type*> typeVec_t;\n+\n+ int charsFromNewline(const std::string &s);\n//---[ Specifier ]------------------\nclass specifier {\n@@ -97,6 +102,8 @@ namespace occa {\nvirtual ~type();\n+ void replaceBaseType(const type &baseType_);\n+\nvirtual type& clone() const;\ninline void add(const qualifier &q) {\n@@ -111,6 +118,7 @@ namespace occa {\nreturn qualifiers_.has(q) >= 0;\n}\n+ virtual void printDeclarationOn(std::string &out) const;\nvirtual void printOn(std::string &out) const;\n};\n@@ -121,6 +129,9 @@ namespace occa {\nvirtual ~primitive();\nvirtual type& clone() const;\n+\n+ virtual void printDeclarationOn(std::string &out) const;\n+ virtual void printOn(std::string &out) const;\n};\n//---[ Pointer ]--------------------\n@@ -132,6 +143,7 @@ namespace occa {\nvirtual type& clone() const;\n+ virtual void printDeclarationOn(std::string &out) const;\nvirtual void printOn(std::string &out) const;\n};\n@@ -143,6 +155,7 @@ namespace occa {\nvirtual type& clone() const;\n+ virtual void printDeclarationOn(std::string &out) const;\nvirtual void printOn(std::string &out) const;\n};\n@@ -155,6 +168,7 @@ namespace occa {\nvirtual type& clone() const;\n+ virtual void printDeclarationOn(std::string &out) const;\nvirtual void printOn(std::string &out) const;\n};\n@@ -164,6 +178,33 @@ namespace occa {\nvirtual type& clone() const;\n};\n+\n+ //---[ Function ]-------------------\n+ class function : public type {\n+ public:\n+ typeVec_t args;\n+\n+ function(const type &returnType);\n+ function(const type &returnType, const std::string &name_);\n+ virtual ~function();\n+\n+ void setReturnType(const type &returnType);\n+ const type& returnType() const;\n+\n+ void add(const type &argType,\n+ const std::string &argName = \"\");\n+\n+ void add(const qualifiers &qs,\n+ const type &argType,\n+ const std::string &argName = \"\");\n+\n+ inline int argumentCount() const {\n+ return (int) args.size();\n+ }\n+\n+ virtual void printDeclarationOn(std::string &out) const;\n+ virtual void printOn(std::string &out) const;\n+ };\n}\n}\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/src/type.cpp",
"new_path": "parser_sandbox/src/type.cpp",
"diff": "namespace occa {\nnamespace lang {\n+ int charsFromNewline(const std::string &s) {\n+ const char *c = s.c_str();\n+ const int chars = (int) s.size();\n+ for (int pos = (chars - 1); pos >= 0; --pos) {\n+ if (*c == '\\n') {\n+ return (chars - pos - 1);\n+ }\n+ }\n+ return chars;\n+ }\n+\n//---[ Specifier ]------------------\nspecifier::specifier(const int specType_) :\nname(),\n@@ -127,6 +138,13 @@ namespace occa {\n}\n}\n+ void type::replaceBaseType(const type &baseType_) {\n+ if (baseType && baseType->isUnnamed()) {\n+ delete baseType;\n+ }\n+ baseType = &(baseType_.clone());\n+ }\n+\ntype& type::clone() const {\nif (isNamed()) {\nreturn *(const_cast<type*>(this));\n@@ -137,6 +155,22 @@ namespace occa {\nreturn *(new type(qualifiers_));\n}\n+ void type::printDeclarationOn(std::string &out) const {\n+ if (qualifiers_.size()) {\n+ qualifiers_.printOn(out);\n+ if (baseType || isNamed()) {\n+ out += ' ';\n+ }\n+ }\n+ if (baseType) {\n+ baseType->printDeclarationOn(out);\n+ if (isNamed()) {\n+ out += ' ';\n+ }\n+ }\n+ out += name;\n+ }\n+\nvoid type::printOn(std::string &out) const {\nif (qualifiers_.size()) {\nqualifiers_.printOn(out);\n@@ -146,10 +180,12 @@ namespace occa {\n}\nif (baseType) {\nbaseType->printOn(out);\n- } else {\n- out += name;\n+ if (isNamed()) {\n+ out += ' ';\n}\n}\n+ out += name;\n+ }\n//---[ Primitive ]------------------\nprimitive::primitive(const std::string &name_) :\n@@ -161,6 +197,14 @@ namespace occa {\nreturn *(const_cast<primitive*>(this));\n}\n+ void primitive::printDeclarationOn(std::string &out) const {\n+ out += name;\n+ }\n+\n+ void primitive::printOn(std::string &out) const {\n+ out += name;\n+ }\n+\n//---[ Pointer ]--------------------\npointer::pointer(const type &t) :\ntype(t) {}\n@@ -176,6 +220,10 @@ namespace occa {\nreturn *(new pointer(qualifiers_, baseType->clone()));\n}\n+ void pointer::printDeclarationOn(std::string &out) const {\n+ pointer::printOn(out);\n+ }\n+\nvoid pointer::printOn(std::string &out) const {\nOCCA_ERROR(\"occa::lang::pointer has a NULL baseType\",\nbaseType);\n@@ -199,6 +247,10 @@ namespace occa {\nreturn *(new reference(baseType->clone()));\n}\n+ void reference::printDeclarationOn(std::string &out) const {\n+ reference::printOn(out);\n+ }\n+\nvoid reference::printOn(std::string &out) const {\nOCCA_ERROR(\"occa::lang::reference has a NULL baseType\",\nbaseType);\n@@ -223,10 +275,9 @@ namespace occa {\nreturn *(const_cast<typedefType*>(this));\n}\n- void typedefType::printOn(std::string &out) const {\n- if (!baseType) {\n- return;\n- }\n+ void typedefType::printDeclarationOn(std::string &out) const {\n+ OCCA_ERROR(\"occa::lang::typedefType has a NULL baseType\",\n+ baseType);\nout += \"typedef \";\nif (qualifiers_.size()) {\nqualifiers_.printOn(out);\n@@ -237,11 +288,79 @@ namespace occa {\nout += name;\n}\n+ void typedefType::printOn(std::string &out) const {\n+ out += name;\n+ }\n+\n//---[ Class ]----------------------\nclassType::~classType() {}\ntype& classType::clone() const {\nreturn *(const_cast<classType*>(this));\n}\n+\n+ //---[ Function ]-------------------\n+ function::function(const type &returnType_) :\n+ type(returnType_) {}\n+\n+ function::function(const type &returnType_, const std::string &name_) :\n+ type(returnType_, name_) {}\n+\n+ function::~function() {\n+ const int argCount = argumentCount();\n+ if (!argCount) {\n+ return;\n+ }\n+ type **args_ = &(args[0]);\n+ for (int i = 0; i < argCount; ++i) {\n+ if (args_[i]->isUnnamed()) {\n+ delete args_[i];\n+ }\n+ }\n+ }\n+\n+ void function::setReturnType(const type &returnType) {\n+ replaceBaseType(returnType);\n+ }\n+\n+ const type& function::returnType() const {\n+ OCCA_ERROR(\"occa::lang::function has a NULL baseType\",\n+ baseType);\n+ return *(baseType);\n+ }\n+\n+ void function::add(const type &argType, const std::string &argName) {\n+ args.push_back(new type(argType, argName));\n+ }\n+\n+ void function::add(const qualifiers &qs,\n+ const type &argType,\n+ const std::string &argName) {\n+\n+ args.push_back(new type(qs, argType, argName));\n+ }\n+\n+ void function::printDeclarationOn(std::string &out) const {\n+ function::printOn(out);\n+ }\n+\n+ void function::printOn(std::string &out) const {\n+ OCCA_ERROR(\"occa::lang::function has a NULL baseType\",\n+ baseType);\n+ baseType->printOn(out);\n+ out += ' ';\n+ out += name;\n+ out += \" (\";\n+ const std::string argIndent(charsFromNewline(out), ' ');\n+ const int argCount = argumentCount();\n+ for (int i = 0; i < argCount; ++i) {\n+ if (i) {\n+ out += \",\\n\";\n+ out += argIndent;\n+ }\n+ args[i]->printOn(out);\n+ }\n+ out += ')';\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/tests/testFunction.cpp",
"new_path": "parser_sandbox/tests/testFunction.cpp",
"diff": "@@ -24,9 +24,12 @@ void testFunction() {\ntypedefType td1 = typedefType(t1, \"t1\");\ntypedefType td2 = typedefType(t2, \"t2\");\n- // function f(void_, \"foo\");\n- // f.addArgument(t1, \"a\");\n- // f.addArgument(t2, \"b\");\n+ function f(void_, \"foo\");\n+ f.add(t1 , \"a\");\n+ f.add(td2 , \"b\");\n+ f.add(volatile_, float_ , \"c\");\n+ f.add(pointer(const_, char_));\n+ f.add(double_, \"e\");\nstd::cout << \"q1 = \" << q1 << '\\n'\n<< \"t1_0 = \" << t1_0 << '\\n'\n@@ -34,5 +37,6 @@ void testFunction() {\n<< \"t1 = \" << t1 << '\\n'\n<< \"t2 = \" << t2 << '\\n'\n<< \"td1 = \" << td1 << '\\n'\n- << \"td2 = \" << td2 << '\\n';\n+ << \"td2 = \" << td2 << '\\n'\n+ << \"f =\\n\" << f << '\\n';\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Parser] Added function
|
378,349 |
12.03.2017 04:11:12
| 18,000 |
bf2e73e0287eca72dff989c6f277ead2affae7cb
|
[Parser] Renamed types to end with Type
|
[
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/include/type.hpp",
"new_path": "parser_sandbox/include/type.hpp",
"diff": "@@ -122,11 +122,11 @@ namespace occa {\nvirtual void printOn(std::string &out) const;\n};\n- //---[ Primitive ]------------------\n- class primitive : public type {\n+ //---[ PrimitiveType ]------------------\n+ class primitiveType : public type {\npublic:\n- primitive(const std::string &name_);\n- virtual ~primitive();\n+ primitiveType(const std::string &name_);\n+ virtual ~primitiveType();\nvirtual type& clone() const;\n@@ -135,11 +135,11 @@ namespace occa {\n};\n//---[ Pointer ]--------------------\n- class pointer : public type {\n+ class pointerType : public type {\npublic:\n- pointer(const type &t);\n- pointer(const qualifiers &qs, const type &t);\n- virtual ~pointer();\n+ pointerType(const type &t);\n+ pointerType(const qualifiers &qs, const type &t);\n+ virtual ~pointerType();\nvirtual type& clone() const;\n@@ -148,10 +148,10 @@ namespace occa {\n};\n//---[ Reference ]------------------\n- class reference : public type {\n+ class referenceType : public type {\npublic:\n- reference(const type &t);\n- virtual ~reference();\n+ referenceType(const type &t);\n+ virtual ~referenceType();\nvirtual type& clone() const;\n@@ -180,13 +180,13 @@ namespace occa {\n};\n//---[ Function ]-------------------\n- class function : public type {\n+ class functionType : public type {\npublic:\ntypeVec_t args;\n- function(const type &returnType);\n- function(const type &returnType, const std::string &name_);\n- virtual ~function();\n+ functionType(const type &returnType);\n+ functionType(const type &returnType, const std::string &name_);\n+ virtual ~functionType();\nvoid setReturnType(const type &returnType);\nconst type& returnType() const;\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/include/typeBuiltins.hpp",
"new_path": "parser_sandbox/include/typeBuiltins.hpp",
"diff": "@@ -28,18 +28,18 @@ namespace occa {\nextern const qualifier struct_;\nextern const qualifier union_;\n- extern const primitive bool_;\n- extern const primitive char_;\n- extern const primitive char16_t_;\n- extern const primitive char32_t_;\n- extern const primitive wchar_t_;\n- extern const primitive short_;\n- extern const primitive int_;\n- extern const primitive long_;\n- extern const primitive float_;\n- extern const primitive double_;\n- extern const primitive void_;\n- extern const primitive auto_;\n+ extern const primitiveType bool_;\n+ extern const primitiveType char_;\n+ extern const primitiveType char16_t_;\n+ extern const primitiveType char32_t_;\n+ extern const primitiveType wchar_t_;\n+ extern const primitiveType short_;\n+ extern const primitiveType int_;\n+ extern const primitiveType long_;\n+ extern const primitiveType float_;\n+ extern const primitiveType double_;\n+ extern const primitiveType void_;\n+ extern const primitiveType auto_;\n}\n}\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/src/type.cpp",
"new_path": "parser_sandbox/src/type.cpp",
"diff": "@@ -188,44 +188,44 @@ namespace occa {\n}\n//---[ Primitive ]------------------\n- primitive::primitive(const std::string &name_) :\n+ primitiveType::primitiveType(const std::string &name_) :\ntype(name_, specifier::primitiveType) {}\n- primitive::~primitive() {}\n+ primitiveType::~primitiveType() {}\n- type& primitive::clone() const {\n- return *(const_cast<primitive*>(this));\n+ type& primitiveType::clone() const {\n+ return *(const_cast<primitiveType*>(this));\n}\n- void primitive::printDeclarationOn(std::string &out) const {\n+ void primitiveType::printDeclarationOn(std::string &out) const {\nout += name;\n}\n- void primitive::printOn(std::string &out) const {\n+ void primitiveType::printOn(std::string &out) const {\nout += name;\n}\n//---[ Pointer ]--------------------\n- pointer::pointer(const type &t) :\n+ pointerType::pointerType(const type &t) :\ntype(t) {}\n- pointer::pointer(const qualifiers &qs, const type &t) :\n+ pointerType::pointerType(const qualifiers &qs, const type &t) :\ntype(qs, t) {}\n- pointer::~pointer() {}\n+ pointerType::~pointerType() {}\n- type& pointer::clone() const {\n- OCCA_ERROR(\"occa::lang::pointer has a NULL baseType\",\n+ type& pointerType::clone() const {\n+ OCCA_ERROR(\"occa::lang::pointerType has a NULL baseType\",\nbaseType);\n- return *(new pointer(qualifiers_, baseType->clone()));\n+ return *(new pointerType(qualifiers_, baseType->clone()));\n}\n- void pointer::printDeclarationOn(std::string &out) const {\n- pointer::printOn(out);\n+ void pointerType::printDeclarationOn(std::string &out) const {\n+ pointerType::printOn(out);\n}\n- void pointer::printOn(std::string &out) const {\n- OCCA_ERROR(\"occa::lang::pointer has a NULL baseType\",\n+ void pointerType::printOn(std::string &out) const {\n+ OCCA_ERROR(\"occa::lang::pointerType has a NULL baseType\",\nbaseType);\nbaseType->printOn(out);\nout += \" *\";\n@@ -236,23 +236,23 @@ namespace occa {\n}\n//---[ Reference ]--------------------\n- reference::reference(const type &t) :\n+ referenceType::referenceType(const type &t) :\ntype(t) {}\n- reference::~reference() {}\n+ referenceType::~referenceType() {}\n- type& reference::clone() const {\n- OCCA_ERROR(\"occa::lang::reference has a NULL baseType\",\n+ type& referenceType::clone() const {\n+ OCCA_ERROR(\"occa::lang::referenceType has a NULL baseType\",\nbaseType);\n- return *(new reference(baseType->clone()));\n+ return *(new referenceType(baseType->clone()));\n}\n- void reference::printDeclarationOn(std::string &out) const {\n- reference::printOn(out);\n+ void referenceType::printDeclarationOn(std::string &out) const {\n+ referenceType::printOn(out);\n}\n- void reference::printOn(std::string &out) const {\n- OCCA_ERROR(\"occa::lang::reference has a NULL baseType\",\n+ void referenceType::printOn(std::string &out) const {\n+ OCCA_ERROR(\"occa::lang::referenceType has a NULL baseType\",\nbaseType);\nbaseType->printOn(out);\nout += \" &\";\n@@ -300,13 +300,13 @@ namespace occa {\n}\n//---[ Function ]-------------------\n- function::function(const type &returnType_) :\n+ functionType::functionType(const type &returnType_) :\ntype(returnType_) {}\n- function::function(const type &returnType_, const std::string &name_) :\n+ functionType::functionType(const type &returnType_, const std::string &name_) :\ntype(returnType_, name_) {}\n- function::~function() {\n+ functionType::~functionType() {\nconst int argCount = argumentCount();\nif (!argCount) {\nreturn;\n@@ -319,33 +319,33 @@ namespace occa {\n}\n}\n- void function::setReturnType(const type &returnType) {\n+ void functionType::setReturnType(const type &returnType) {\nreplaceBaseType(returnType);\n}\n- const type& function::returnType() const {\n- OCCA_ERROR(\"occa::lang::function has a NULL baseType\",\n+ const type& functionType::returnType() const {\n+ OCCA_ERROR(\"occa::lang::functionType has a NULL baseType\",\nbaseType);\nreturn *(baseType);\n}\n- void function::add(const type &argType, const std::string &argName) {\n+ void functionType::add(const type &argType, const std::string &argName) {\nargs.push_back(new type(argType, argName));\n}\n- void function::add(const qualifiers &qs,\n+ void functionType::add(const qualifiers &qs,\nconst type &argType,\nconst std::string &argName) {\nargs.push_back(new type(qs, argType, argName));\n}\n- void function::printDeclarationOn(std::string &out) const {\n- function::printOn(out);\n+ void functionType::printDeclarationOn(std::string &out) const {\n+ functionType::printOn(out);\n}\n- void function::printOn(std::string &out) const {\n- OCCA_ERROR(\"occa::lang::function has a NULL baseType\",\n+ void functionType::printOn(std::string &out) const {\n+ OCCA_ERROR(\"occa::lang::functionType has a NULL baseType\",\nbaseType);\nbaseType->printOn(out);\nout += ' ';\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/src/typeBuiltins.cpp",
"new_path": "parser_sandbox/src/typeBuiltins.cpp",
"diff": "@@ -25,17 +25,17 @@ namespace occa {\nconst qualifier struct_ (\"struct\", specifier::variableType);\nconst qualifier union_ (\"union\" , specifier::variableType);\n- const primitive bool_ (\"bool\");\n- const primitive char_ (\"char\");\n- const primitive char16_t_ (\"char16_t\");\n- const primitive char32_t_ (\"char32_t\");\n- const primitive wchar_t_ (\"wchar_t\");\n- const primitive short_ (\"short\");\n- const primitive int_ (\"int\");\n- const primitive long_ (\"long\");\n- const primitive float_ (\"float\");\n- const primitive double_ (\"double\");\n- const primitive void_ (\"void\");\n- const primitive auto_ (\"auto\");\n+ const primitiveType bool_ (\"bool\");\n+ const primitiveType char_ (\"char\");\n+ const primitiveType char16_t_ (\"char16_t\");\n+ const primitiveType char32_t_ (\"char32_t\");\n+ const primitiveType wchar_t_ (\"wchar_t\");\n+ const primitiveType short_ (\"short\");\n+ const primitiveType int_ (\"int\");\n+ const primitiveType long_ (\"long\");\n+ const primitiveType float_ (\"float\");\n+ const primitiveType double_ (\"double\");\n+ const primitiveType void_ (\"void\");\n+ const primitiveType auto_ (\"auto\");\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/tests/testFunction.cpp",
"new_path": "parser_sandbox/tests/testFunction.cpp",
"diff": "@@ -18,17 +18,17 @@ void testFunction() {\ntype t1_0(float_);\nt1_0.add(const_);\n- pointer t1_1(q1, t1_0);\n- reference t1(t1_1);\n- pointer t2(const_, t1_1);\n+ pointerType t1_1(q1, t1_0);\n+ referenceType t1(t1_1);\n+ pointerType t2(const_, t1_1);\ntypedefType td1 = typedefType(t1, \"t1\");\ntypedefType td2 = typedefType(t2, \"t2\");\n- function f(void_, \"foo\");\n+ functionType f(void_, \"foo\");\nf.add(t1 , \"a\");\nf.add(td2 , \"b\");\nf.add(volatile_, float_ , \"c\");\n- f.add(pointer(const_, char_));\n+ f.add(pointerType(const_, char_));\nf.add(double_, \"e\");\nstd::cout << \"q1 = \" << q1 << '\\n'\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Parser] Renamed types to end with Type
|
378,349 |
12.03.2017 11:18:33
| 18,000 |
f58dfab951edb9b12299ca025041133c4016cb8b
|
[Parser] Fixed bug with nested #ifs
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/parser/tools.hpp",
"new_path": "include/occa/parser/tools.hpp",
"diff": "@@ -109,8 +109,6 @@ namespace occa {\nvoid compressAllWhitespace(std::string &str,\nconst int parsingLanguage_ = parserInfo::parsingC);\n- char* cReadFile(const std::string &filename);\n-\nint stripComments(std::string &line,\nconst int parsingLanguage_ = parserInfo::parsingC);\nint stripFortranComments(std::string &line);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/parser/parser.cpp",
"new_path": "src/parser/parser.cpp",
"diff": "@@ -218,20 +218,12 @@ namespace occa {\nwhile((*c != '\\n') &&\n(*c != '\\0')) {\n-\n++c;\n}\n- std::string iFilename = compressAllWhitespace(cStart, c - cStart);\n- const int chars = iFilename.size();\n-\n- const bool skipFirst = ((iFilename[0] == '\"') ||\n- (iFilename[0] == '<'));\n-\n- const bool skipLast = ((iFilename[chars - 1] == '\"') ||\n- (iFilename[chars - 1] == '<'));\n-\n- return iFilename.substr(skipFirst, chars - (skipFirst + skipLast));\n+ const std::string iFilename = compressAllWhitespace(cStart, c - cStart);\n+ io::fileOpener &opener = io::fileOpener::get(iFilename);\n+ return opener.expand(iFilename);\n}\ntypeHolder parserBase::evaluateMacroStatement(const char *c) {\n@@ -366,15 +358,19 @@ namespace occa {\nskipToWhitespace(cEnd);\nif (stringsAreEqual(c, (cEnd - c), \"if\")) {\n+ if (state & ignoring) {\n+ return (startHash | ignoreUntilEnd);\n+ }\nc = cEnd;\nbool isTrue = evaluateMacroBoolStatement(c);\n- if (isTrue)\n+ if (isTrue) {\nreturn (startHash | readUntilNextHash);\n- else\n+ } else {\nreturn (startHash | ignoreUntilNextHash);\n}\n+ }\nelse if (stringsAreEqual(c, (cEnd - c), \"elif\")) {\nif ((state & readUntilNextHash) || (state & ignoreUntilEnd))\n@@ -391,11 +387,12 @@ namespace occa {\n}\nelse if (stringsAreEqual(c, (cEnd - c), \"else\")) {\n- if ((state & readUntilNextHash) || (state & ignoreUntilEnd))\n+ if ((state & readUntilNextHash) || (state & ignoreUntilEnd)) {\nreturn (ignoreUntilEnd);\n- else\n+ } else {\nreturn (readUntilNextHash);\n}\n+ }\nelse if (stringsAreEqual(c, (cEnd - c), \"ifdef\")) {\nstd::string name = getMacroName(c);\n@@ -465,13 +462,12 @@ namespace occa {\nreturn (state | keepMacro);\nstd::string includeFile = getMacroIncludeFile(c);\n-\nincludeFile = io::filename(includeFile);\nif (includeFile == \"\")\nreturn (state);\n- const char *cRoot = cReadFile(includeFile);\n+ const char *cRoot = io::c_read(includeFile);\nexpNode includeExpRoot = splitContent(cRoot, parsingLanguage);\n@@ -709,9 +705,10 @@ namespace occa {\nignoreLine = true;\n}\n- if (ignoreLine)\n+ if (ignoreLine) {\nlinesIgnored.push_back(linePos);\n}\n+ }\nif (linesIgnored.size() == 0)\nreturn;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/parser/tools.cpp",
"new_path": "src/parser/tools.cpp",
"diff": "#include \"occa/parser/preprocessor.hpp\"\n#include \"occa/parser/tools.hpp\"\n#include \"occa/tools/env.hpp\"\n+#include \"occa/tools/io.hpp\"\n#include \"occa/tools/sys.hpp\"\nnamespace occa {\n@@ -524,26 +525,6 @@ namespace occa {\nstr = compressAllWhitespace(str.c_str(), str.size());\n}\n- char* cReadFile(const std::string &filename) {\n- FILE *fp = fopen(filename.c_str(), \"r\");\n- OCCA_ERROR(\"Failed to open [\" << filename << ']',\n- fp != NULL);\n-\n- struct stat statbuf;\n- stat(filename.c_str(), &statbuf);\n-\n- const size_t nchars = statbuf.st_size;\n-\n- char *buffer = new char[nchars + 1]();\n- size_t nread = fread(buffer, sizeof(char), nchars, fp);\n-\n- buffer[nread] = '\\0';\n-\n- fclose(fp);\n-\n- return buffer;\n- }\n-\nint stripComments(std::string &line, const int parsingLanguage_) {\nif (!(parsingLanguage_ & parserInfo::parsingC))\nreturn stripFortranComments(line);\n@@ -560,6 +541,8 @@ namespace occa {\nif ((*cRight == '\\0') || (*cRight == '\\n'))\nbreak;\n+ skipString(cRight, parsingLanguage_);\n+\nif ((cRight[0] == '/') && (cRight[1] == '/')) {\nif ( !(status == parserNS::insideCommentBlock) ) {\nline += std::string(cLeft, cRight - cLeft);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Parser] Fixed bug with nested #ifs
|
378,349 |
12.03.2017 18:37:11
| 18,000 |
99b1b2cf7e6a3571f893a47a3977b0a7b966ef6b
|
[Memory] Added shorthand methods for memcpy and copy{To,From}
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/base.hpp",
"new_path": "include/occa/base.hpp",
"diff": "@@ -112,6 +112,18 @@ namespace occa {\nconst dim_t destOffset = 0,\nconst dim_t srcOffset = 0,\nconst occa::properties &props = properties());\n+\n+ void memcpy(void *dest, const void *src,\n+ const occa::properties &props);\n+\n+ void memcpy(memory dest, const void *src,\n+ const occa::properties &props);\n+\n+ void memcpy(void *dest, memory src,\n+ const occa::properties &props);\n+\n+ void memcpy(memory dest, memory src,\n+ const occa::properties &props);\n//====================================\n//---[ Free Functions ]---------------\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/memory.hpp",
"new_path": "include/occa/memory.hpp",
"diff": "@@ -184,6 +184,18 @@ namespace occa {\nconst dim_t srcOffset = 0,\nconst occa::properties &props = occa::properties());\n+ void copyFrom(const void *src,\n+ const occa::properties &props);\n+\n+ void copyFrom(const memory src,\n+ const occa::properties &props);\n+\n+ void copyTo(void *dest,\n+ const occa::properties &props);\n+\n+ void copyTo(const memory dest,\n+ const occa::properties &props);\n+\nvoid free();\nvoid detach();\nvoid deleteRefs(const bool freeMemory = false);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/base.cpp",
"new_path": "src/base.cpp",
"diff": "@@ -194,6 +194,26 @@ namespace occa {\ndest.copyFrom(src, bytes, destOffset, srcOffset, props);\n}\n+\n+ void memcpy(void *dest, const void *src,\n+ const occa::properties &props) {\n+ memcpy(dest, src, -1, props);\n+ }\n+\n+ void memcpy(memory dest, const void *src,\n+ const occa::properties &props) {\n+ memcpy(dest, src, -1, 0, props);\n+ }\n+\n+ void memcpy(void *dest, memory src,\n+ const occa::properties &props) {\n+ memcpy(dest, src, -1, 0, props);\n+ }\n+\n+ void memcpy(memory dest, memory src,\n+ const occa::properties &props) {\n+ memcpy(dest, src, -1, 0, 0, props);\n+ }\n//====================================\n//---[ Free Functions ]---------------\n"
},
{
"change_type": "MODIFY",
"old_path": "src/device.cpp",
"new_path": "src/device.cpp",
"diff": "@@ -134,7 +134,7 @@ namespace occa {\nfor (size_t i = 0; i < staleEntries; ++i) {\nocca::memory_v *mem = uvaStaleMemory[i];\n- mem->copyTo(mem->uvaPtr, mem->size, 0, occa::properties(\"async: true\"));\n+ mem->copyTo(mem->uvaPtr, mem->size, 0, \"async: true\");\nmem->memInfo &= ~uvaFlag::inDevice;\nmem->memInfo &= ~uvaFlag::isStale;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/memory.cpp",
"new_path": "src/memory.cpp",
"diff": "@@ -324,6 +324,26 @@ namespace occa {\ndest.mHandle->copyFrom(mHandle, bytes_, destOffset, srcOffset, props);\n}\n+ void memory::copyFrom(const void *src,\n+ const occa::properties &props) {\n+ copyFrom(src, -1, 0, props);\n+ }\n+\n+ void memory::copyFrom(const memory src,\n+ const occa::properties &props) {\n+ copyFrom(src, -1, 0, 0, props);\n+ }\n+\n+ void memory::copyTo(void *dest,\n+ const occa::properties &props) {\n+ copyTo(dest, -1, 0, props);\n+ }\n+\n+ void memory::copyTo(const memory dest,\n+ const occa::properties &props) {\n+ copyTo(dest, -1, 0, 0, props);\n+ }\n+\nvoid memory::free() {\ndeleteRefs(true);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/memory.cpp",
"new_path": "src/modes/cuda/memory.cpp",
"diff": "@@ -37,6 +37,9 @@ namespace occa {\nmemory::~memory() {}\nvoid* memory::getHandle(const occa::properties &properties_) {\n+ if (properties_.get<std::string>(\"type\", \"\") == \"mapped\") {\n+ return mappedPtr;\n+ }\nreturn handle;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/opencl/memory.cpp",
"new_path": "src/modes/opencl/memory.cpp",
"diff": "@@ -38,6 +38,9 @@ namespace occa {\nmemory::~memory() {}\nvoid* memory::getHandle(const occa::properties &properties_) {\n+ if (properties_.get<std::string>(\"type\", \"\") == \"mapped\") {\n+ return mappedPtr;\n+ }\nreturn handle;\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Memory] Added shorthand methods for memcpy and copy{To,From}
|
378,349 |
15.03.2017 07:07:05
| 18,000 |
9fbeb14d51df1a84c21055b42a09663d44fad60c
|
[Device] Made properties() non-constant (good to add things like compiler flags)
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/device.hpp",
"new_path": "include/occa/device.hpp",
"diff": "@@ -127,7 +127,7 @@ namespace occa {\nbool isInitialized();\nconst std::string& mode();\n- const occa::properties& properties();\n+ occa::properties& properties();\nvoid* getHandle(const occa::properties &props = occa::properties());\ndevice_v* getDHandle() const;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/device.cpp",
"new_path": "src/device.cpp",
"diff": "@@ -116,7 +116,7 @@ namespace occa {\nreturn dHandle->mode;\n}\n- const occa::properties& device::properties() {\n+ occa::properties& device::properties() {\nreturn dHandle->properties;\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Device] Made properties() non-constant (good to add things like compiler flags)
|
378,349 |
16.03.2017 15:59:57
| 18,000 |
06f127768ecc84019506b386975399d230c8bb5b
|
[Env] Added OCCA_VERBOSE, [Kernel] source.occa -> source.cpp
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/env.hpp",
"new_path": "include/occa/tools/env.hpp",
"diff": "#include \"occa/defines.hpp\"\n#include \"occa/types.hpp\"\n+#include \"occa/tools/string.hpp\"\nnamespace occa {\nnamespace env {\n@@ -45,6 +46,15 @@ namespace occa {\nstd::string var(const std::string &var);\n+ template <class TM>\n+ TM get(const std::string &var, const TM &defaultsTo = TM()) {\n+ const std::string v = env::var(var);\n+ if (v.size() == 0) {\n+ return defaultsTo;\n+ }\n+ return fromString<TM>(var);\n+ }\n+\nvoid signalExit(int sig);\nclass envInitializer_t {\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/io.hpp",
"new_path": "include/occa/tools/io.hpp",
"diff": "namespace occa {\n// Kernel Caching\nnamespace kc {\n- extern std::string sourceFile;\n- extern std::string binaryFile;\n+ extern const std::string sourceFile;\n+ extern const std::string binaryFile;\n}\nnamespace io {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/env.cpp",
"new_path": "src/tools/env.cpp",
"diff": "@@ -55,7 +55,7 @@ namespace occa {\nproperties &settings_ = settings();\nsettings_[\"version\"] = \"1.0\";\nsettings_[\"parserVersion\"] = \"0.1\";\n- settings_[\"verboseCompilation\"] = false;\n+ settings_[\"verboseCompilation\"] = env::get<bool>(\"OCCA_VERBOSE\", false);\n}\nvoid initSignalHandling() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/io.cpp",
"new_path": "src/tools/io.cpp",
"diff": "namespace occa {\n// Kernel Caching\nnamespace kc {\n- std::string sourceFile = \"source.occa\";\n- std::string binaryFile = \"binary\";\n+ const std::string sourceFile = \"source.cpp\";\n+ const std::string binaryFile = \"binary\";\n}\nnamespace io {\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Env] Added OCCA_VERBOSE, [Kernel] source.occa -> source.cpp
|
378,349 |
16.03.2017 16:25:56
| 18,000 |
2b7fa27112a737cb08e995e67b69aa237b71fb08
|
[Make] Uses user-defined CXXFLAGS/FCFLAGS if available
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/Makefile",
"new_path": "scripts/Makefile",
"diff": "@@ -45,6 +45,22 @@ testPath = $(PROJ_DIR)/tests\ndebugEnabled = 0\ncheckEnabled = 1\n+ifdef OCCA_DEVELOPER\n+ ifeq ($(OCCA_DEVELOPER),1)\n+ ifeq ($(DEBUG),0)\n+ debugEnabled = 0\n+ else\n+ debugEnabled = 1\n+ endif\n+ else\n+ ifeq ($(DEBUG),1)\n+ debugEnabled = 1\n+ else\n+ debugEnabled = 0\n+ endif\n+ endif\n+endif\n+\nosFlags =\nflags =\nfFlags =\n@@ -91,22 +107,6 @@ endif\n#---[ Variables ]---------------------------------\n-ifdef OCCA_DEVELOPER\n- ifeq ($(OCCA_DEVELOPER), 1)\n- ifeq ($(DEBUG), 0)\n- debugEnabled = 0\n- else\n- debugEnabled = 1\n- endif\n- else\n- ifeq ($(DEBUG), 1)\n- debugEnabled = 1\n- else\n- debugEnabled = 0\n- endif\n- endif\n-endif\n-\nifndef CXX\nifdef OCCA_CXX\nCXX = ${OCCA_CXX}\n@@ -120,26 +120,29 @@ ifndef FC\nendif\nifndef CXXFLAGS\n- ifeq ($(DEBUG),1)\n- CXXFLAGS = -g\n+ ifeq ($(debugEnabled),1)\n+ OCCA_DEBUG_ENABLED := 1\n+ compilerFlags = $(debugFlags)\nelse\n- CXXFLAGS = -O3\n+ OCCA_DEBUG_ENABLED := 0\n+ compilerFlags = $(releaseFlags) -DNDEBUG=1\nendif\n+else\n+ compilerFlags = $(CXXFLAGS)\nendif\nifndef FCFLAGS\n- ifeq ($(DEBUG),1)\n- FCFLAGS = -g\n+ ifeq ($(debugEnabled),1)\n+ fCompilerFlags = -g\nelse\n- FCFLAGS = -O3\n+ fCompilerFlags = -O3\nendif\n+else\n+ fCompilerFlags = $(FCFLAGS)\nendif\ncompiler = $(CXX)\n-compilerFlags = $(CXXFLAGS)\n-\nfCompiler = $(FC)\n-fCompilerFlags = $(FCFLAGS)\nlinks = $(LDFLAGS)\n#=================================================\n@@ -307,15 +310,6 @@ else\nendif\nendif\n-ifeq ($(debugEnabled), 1)\n- OCCA_DEBUG_ENABLED := 1\n- cfFlags += $(debugFlags)\n-else\n- OCCA_DEBUG_ENABLED := 0\n- cfFlags += $(releaseFlags)\n- cfFlags += -DNDEBUG=1\n-endif\n-\nifeq ($(checkEnabled),1)\nOCCA_CHECK_ENABLED := 1\nelse\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/shellTools.sh",
"new_path": "scripts/shellTools.sh",
"diff": "@@ -404,7 +404,9 @@ function compilerPicFlag {\nlocal vendor=$(compilerVendor $1)\ncase $vendor in\n- GCC | LLVM | INTEL | PATHSCALE | CRAY | IBM | PGI) command echo \"-fPIC\";;\n+ GCC | LLVM | INTEL | PATHSCALE | CRAY | PGI)\n+ command echo \"-fPIC\";;\n+ IBM) command echo \"-qpic\";;\nHP) command echo \"+z\";;\n*) command echo \"\" ;;\nesac\n@@ -414,7 +416,9 @@ function compilerSharedFlag {\nlocal vendor=$(compilerVendor $1)\ncase $vendor in\n- GCC | LLVM | INTEL | PATHSCALE | CRAY | IBM | PGI) command echo \"-shared\";;\n+ GCC | LLVM | INTEL | PATHSCALE | CRAY | PGI)\n+ command echo \"-shared\";;\n+ IBM) command echo \"-qmkshrobj\";;\nHP) command echo \"-b\" ;;\n*) command echo \"\" ;;\nesac\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Make] Uses user-defined CXXFLAGS/FCFLAGS if available
|
378,349 |
16.03.2017 19:28:17
| 18,000 |
40e0913c3f52fee0d812069f5b9624d14b2ea6cb
|
[Make] Quoted variables in shellTools
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/Makefile",
"new_path": "scripts/Makefile",
"diff": "@@ -128,6 +128,7 @@ ifndef CXXFLAGS\ncompilerFlags = $(releaseFlags) -DNDEBUG=1\nendif\nelse\n+ OCCA_DEBUG_ENABLED := 0\ncompilerFlags = $(CXXFLAGS)\nendif\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/shellTools.sh",
"new_path": "scripts/shellTools.sh",
"diff": "@@ -25,10 +25,10 @@ OCCA_DIR=\"$(cd \"$(dirname \"${BASH_SOURCE[0]}\")\"/.. && pwd)\"\n#---[ Library Information ]-------------\nfunction uniqueAddToPath {\n- local path=$1\n- local dir=$2\n+ local path=\"$1\"\n+ local dir=\"$2\"\n- if [ ! -z $path ]; then\n+ if [ ! -z \"$path\" ]; then\ncase \":$path:\" in\n*\":$dir:\"*) ;; # Already in the path\n*) path=\"$path:$dir\";;\n@@ -37,39 +37,39 @@ function uniqueAddToPath {\npath=\"$dir\"\nfi\n- command echo $path\n+ command echo \"$path\"\n}\nfunction removeDuplicatesInPath {\n- local path=$1\n+ local path=\"$1\"\n- for dir_ in ${path//:/ }; do\n- if ls $dir_ > /dev/null 2>&1; then\n- path=$(uniqueAddToPath $path $dir_)\n+ for dir_ in \"${path//:/ }\"; do\n+ if ls \"$dir_\" > /dev/null 2>&1; then\n+ path=$(uniqueAddToPath \"$path\" \"$dir_\")\nfi\ndone\n- command echo $path\n+ command echo \"$path\"\n}\nfunction getIncludePath {\n- local path=$1\n+ local path=\"$1\"\npath=$(command echo \"$path:\" | command sed 's/\\/lib[^:]*:/\\/include:/g')\n- path=$(removeDuplicatesInPath $path)\n+ path=$(removeDuplicatesInPath \"$path\")\n- command echo $path\n+ command echo \"$path\"\n}\nfunction dirWithFileInPath {\n- local path=$1\n- local filename=$2\n+ local path=\"$1\"\n+ local filename=\"$2\"\n- if [ ! -z $path ]; then\n- for dir_ in ${path//:/ }; do\n- if ls $dir_/$filename > /dev/null 2>&1; then\n- command echo $dir_\n+ if [ ! -z \"$path\" ]; then\n+ for dir_ in \"${path//:/ }\"; do\n+ if ls \"$dir_/$filename\" > /dev/null 2>&1; then\n+ command echo \"$dir_\"\nreturn\nfi\ndone\n@@ -79,13 +79,13 @@ function dirWithFileInPath {\n}\nfunction dirWithFileInIncludePath {\n- local path=$(getIncludePath $1)\n- local filename=$2\n+ local path=$(getIncludePath \"$1\")\n+ local filename=\"$2\"\n- if [ ! -z $path ]; then\n- for dir_ in ${path//:/ }; do\n- if ls $dir_/$filename > /dev/null 2>&1; then\n- command echo $dir_\n+ if [ ! -z \"$path\" ]; then\n+ for dir_ in \"${path//:/ }\"; do\n+ if ls \"$dir_/$filename\" > /dev/null 2>&1; then\n+ command echo \"$dir_\"\nreturn\nfi\ndone\n@@ -107,18 +107,18 @@ function dirWithLibrary {\nmergedLibPaths=$mergedLibPaths:\"/lib:/usr/lib:/usr/lib32:/usr/lib64:\"\nmergedLibPaths=$mergedLibPaths:\"/usr/lib/*-gnu/\"\n- result=$(dirWithFileInPath \"$mergedLibPaths\" $libName)\n+ result=$(dirWithFileInPath \"$mergedLibPaths\" \"$libName\")\n- if [ ! -z $result ]; then command echo $result; return; fi\n+ if [ ! -z \"$result\" ]; then command echo \"$result\"; return; fi\nif hash ldconfig 2> /dev/null; then\n- command echo $(command ldconfig -p | command grep -m 1 $libName | command sed 's/.*=>\\(.*\\/\\).*/\\1/g')\n+ command echo $(command ldconfig -p | command grep -m 1 \"$libName\" | command sed 's/.*=>\\(.*\\/\\).*/\\1/g')\nreturn\nfi\ncase \"$(uname)\" in\nDarwin)\n- if ls /System/Library/Frameworks/$1.framework > /dev/null 2>&1; then\n+ if ls \"/System/Library/Frameworks/$1.framework\" > /dev/null 2>&1; then\ncommand echo \"Is A System/Library Framework\"\nreturn\nfi\n@@ -153,22 +153,22 @@ function dirWithHeader {\nmergedLibPaths=$mergedLibPaths:\"/lib:/usr/lib:/usr/lib32:/usr/lib64:\"\nmergedLibPaths=$mergedLibPaths:\"/usr/lib/*-gnu/\"\n- result=$(dirWithFileInPath \"$mergedPaths\" $filename)\n- if [ ! -z $result ]; then command echo $result; return; fi\n+ result=$(dirWithFileInPath \"$mergedPaths\" \"$filename\")\n+ if [ ! -z \"$result\" ]; then command echo \"$result\"; return; fi\n- result=$(dirWithFileInIncludePath \"$mergedLibPaths\" $filename)\n+ result=$(dirWithFileInIncludePath \"$mergedLibPaths\" \"$filename\")\n- if [ ! -z $result ]; then command echo $result; return; fi\n+ if [ ! -z \"$result\" ]; then command echo \"$result\"; return; fi\ncommand echo \"\"\n}\nfunction dirsWithHeaders {\n- local headers=$1\n+ local headers=\"$1\"\nlocal path=\"\"\nif [ ! -z $headers ]; then\n- for header in ${headers//:/ }; do\n+ for header in \"${headers//:/ }\"; do\nlocal inc=$(dirWithHeader $header)\nif [ ! -z $inc ]; then\n@@ -180,11 +180,11 @@ function dirsWithHeaders {\ndone\nfi\n- command echo $path\n+ command echo \"$path\"\n}\nfunction libraryFlags {\n- local libName=$1\n+ local libName=\"$1\"\nlocal libDir=$(dirWithLibrary $libName)\nlocal flags=\"\"\n@@ -202,83 +202,83 @@ function libraryFlags {\nflags=\"-L$libDir -l$libName\"\nfi\n- command echo $flags\n+ command echo \"$flags\"\n}\nfunction headerFlags {\n- local headers=$1\n+ local headers=\"$1\"\nlocal incDirs\nlocal flags=\"\"\n- if [ ! -z $headers ]; then\n- incDirs=$(dirsWithHeaders $headers)\n+ if [ ! -z \"$headers\" ]; then\n+ incDirs=$(dirsWithHeaders \"$headers\")\n- if [ -z $incDirs ]; then command echo \"\"; return; fi\n+ if [ -z \"$incDirs\" ]; then command echo \"\"; return; fi\n- incDirs=${incDirs%?} # Remove the last :\n+ incDirs=\"${incDirs%?}\" # Remove the last :\nflags=\"-I${incDirs//:/ -I}\" # : -> -I\nfi\n- command echo $flags\n+ command echo \"$flags\"\n}\n#=======================================\n#---[ Compiler Information ]------------\nfunction getPath {\n- command echo ${1%/*}\n+ command echo \"${1%/*}\"\n}\nfunction stripPath {\n- command echo ${1##*/}\n+ command echo \"${1##*/}\"\n}\nfunction resolveRelativePath {\n- local from=$1\n- local to=$2\n+ local from=\"$1\"\n+ local to=\"$2\"\n- if [[ $to == /* ]]; then\n- echo $to\n+ if [[ \"$to\" == /* ]]; then\n+ echo \"$to\"\nelse\n- echo $(getPath $from)/$to\n+ echo $(getPath \"$from\")/\"$to\"\nfi\n}\nfunction manualReadlink {\nif [[ $(command -v readlink) == \"\" ]]; then\n- pushd `dirname $1` > /dev/null\n+ pushd `dirname \"$1\"` > /dev/null\nSCRIPTPATH=`pwd -P`\npopd > /dev/null\nelse\ncase \"$(uname)\" in\n- Darwin) readlink $1;;\n- *) readlink -f $1;;\n+ Darwin) readlink \"$1\";;\n+ *) readlink -f \"$1\";;\nesac\nfi\n}\nfunction manualWhich {\n- local input=$1\n+ local input=\"$1\"\n- local typeOutput=$(command type $input 2> /dev/null)\n+ local typeOutput=$(command type \"$input\" 2> /dev/null)\nif [[ $typeOutput == *\" is hashed \"* ]]; then\n- local mWhich=$(command type $input 2> /dev/null | sed \"s/.*(\\(.*\\)).*/\\1/g\")\n+ local mWhich=$(command type \"$input\" 2> /dev/null | sed \"s/.*(\\(.*\\)).*/\\1/g\")\nelse\n- local mWhich=$(command type $input 2> /dev/null | sed \"s/.* is \\(.*\\)/\\1/g\")\n+ local mWhich=$(command type \"$input\" 2> /dev/null | sed \"s/.* is \\(.*\\)/\\1/g\")\nfi\nif [ ! -z \"$mWhich\" ]; then\n- echo $mWhich\n+ echo \"$mWhich\"\nelse\n- echo $input\n+ echo \"$input\"\nfi\n}\nfunction realCommand {\n- local a=$(manualWhich $1)\n+ local a=$(manualWhich \"$1\")\nlocal b\ncase \"$(uname)\" in\n@@ -286,22 +286,22 @@ function realCommand {\n*) b=\"$(manualReadlink $a)\";;\nesac\n- if [ -z $b ]; then\n- command echo $a\n+ if [ -z \"$b\" ]; then\n+ command echo \"$a\"\nreturn\nfi\nwhile [ \"$a\" != \"$b\" ]; do\n- b=$(resolveRelativePath $a $b)\n- a=$(manualWhich $b)\n+ b=$(resolveRelativePath \"$a\" \"$b\")\n+ a=$(manualWhich \"$b\")\ncase \"$(uname)\" in\nDarwin) b=\"$(manualReadlink $a)\";;\n*) b=\"$(manualReadlink $a)\";;\nesac\n- if [ -z $b ]; then\n- command echo $a\n+ if [ -z \"$b\" ]; then\n+ command echo \"$a\"\nreturn\nfi\ndone\n@@ -310,32 +310,32 @@ function realCommand {\n}\nfunction unaliasCommand {\n- typeOutput=$(command type $1 2> /dev/null)\n+ typeOutput=$(command type \"$1\" 2> /dev/null)\n- aliasedTo=$(command echo $typeOutput | command grep -m 1 \"$1 is aliased to\" | command sed \"s/[^\\`]*\\`\\([^ \\t']*\\)[ \\t']/\\1/g\")\n+ aliasedTo=$(command echo \"$typeOutput\" | command grep -m 1 \"$1 is aliased to\" | command sed \"s/[^\\`]*\\`\\([^ \\t']*\\)[ \\t']/\\1/g\")\n- if [ ! -z $aliasedTo ]; then\n- command echo $aliasedTo\n+ if [ ! -z \"$aliasedTo\" ]; then\n+ command echo \"$aliasedTo\"\nreturn\nfi\n- command echo $1\n+ command echo \"$1\"\n}\nfunction compilerName {\n- local chosenCompiler=$1\n- local realCompiler=$(realCommand $chosenCompiler)\n- local unaliasedCompiler=$(unaliasCommand $realCompiler)\n- local strippedCompiler=$(stripPath $unaliasedCompiler)\n- command echo $strippedCompiler\n+ local chosenCompiler=\"$1\"\n+ local realCompiler=$(realCommand \"$chosenCompiler\")\n+ local unaliasedCompiler=$(unaliasCommand \"$realCompiler\")\n+ local strippedCompiler=$(stripPath \"$unaliasedCompiler\")\n+ command echo \"$strippedCompiler\"\n}\nfunction compilerVendor {\n- local chosenCompiler=$1\n- local compiler=$(compilerName $1)\n+ local chosenCompiler=\"$1\"\n+ local compiler=$(compilerName \"$1\")\n# Fortran Compilers\n- case $compiler in\n+ case \"$compiler\" in\ngfortran*) command echo GCC ; return;;\nifort*) command echo INTEL ; return;;\nftn*) command echo CRAY ; return;;\n@@ -357,29 +357,29 @@ function compilerVendor {\nlocal testFilename=\"${OCCA_DIR}/scripts/compilerVendorTest.cpp\"\nlocal binaryFilename=\"${OCCA_DIR}/scripts/compilerVendorTest\"\n- eval \"${chosenCompiler} ${testFilename} -o ${binaryFilename} > /dev/null 2>&1\"\n+ eval \"${chosenCompiler}\" \"${testFilename}\" -o \"${binaryFilename}\" > /dev/null 2>&1\neval \"${binaryFilename}\"\n- bit=$?\n+ bit=\"$?\"\n# C/C++ Compilers\n- case $bit in\n- ${b_GNU}) command echo GCC ;;\n- ${b_LLVM}) command echo LLVM ;;\n- ${b_Intel}) command echo INTEL ;;\n- ${b_IBM}) command echo IBM ;;\n- ${b_PGI}) command echo PGI ;;\n- ${b_Pathscale}) command echo PATHSCALE ;;\n- ${b_HP}) command echo HP ;;\n- ${b_Cray}) command echo CRAY ;;\n- ${b_VisualStudio}) command echo VISUALSTUDIO ;;\n+ case \"$bit\" in\n+ \"${b_GNU}\") command echo GCC ;;\n+ \"${b_LLVM}\") command echo LLVM ;;\n+ \"${b_Intel}\") command echo INTEL ;;\n+ \"${b_IBM}\") command echo IBM ;;\n+ \"${b_PGI}\") command echo PGI ;;\n+ \"${b_Pathscale}\") command echo PATHSCALE ;;\n+ \"${b_HP}\") command echo HP ;;\n+ \"${b_Cray}\") command echo CRAY ;;\n+ \"${b_VisualStudio}\") command echo VISUALSTUDIO ;;\n*) command echo N/A ;;\nesac\n}\nfunction compilerReleaseFlags {\n- local vendor=$(compilerVendor $1)\n+ local vendor=$(compilerVendor \"$1\")\n- case $vendor in\n+ case \"$vendor\" in\nGCC|LLVM) command echo \"-O3 -D __extern_always_inline=inline\" ;;\nINTEL) command echo \"-O3 -xHost\" ;;\nCRAY) command echo \"-O3 -h intrinsics -fast\" ;;\n@@ -392,18 +392,18 @@ function compilerReleaseFlags {\n}\nfunction compilerDebugFlags {\n- local vendor=$(compilerVendor $1)\n+ local vendor=$(compilerVendor \"$1\")\n- case $vendor in\n+ case \"$vendor\" in\nN/A) ;;\n*) command echo \"-g\" ;;\nesac\n}\nfunction compilerPicFlag {\n- local vendor=$(compilerVendor $1)\n+ local vendor=$(compilerVendor \"$1\")\n- case $vendor in\n+ case \"$vendor\" in\nGCC|LLVM|INTEL|PATHSCALE|CRAY|PGI)\ncommand echo \"-fPIC\";;\nIBM) command echo \"-qpic\";;\n@@ -413,9 +413,9 @@ function compilerPicFlag {\n}\nfunction compilerSharedFlag {\n- local vendor=$(compilerVendor $1)\n+ local vendor=$(compilerVendor \"$1\")\n- case $vendor in\n+ case \"$vendor\" in\nGCC|LLVM|INTEL|PATHSCALE|CRAY|PGI)\ncommand echo \"-shared\";;\nIBM) command echo \"-qmkshrobj\";;\n@@ -427,7 +427,7 @@ function compilerSharedFlag {\nfunction compilerOpenMPFlags {\nlocal vendor=$(compilerVendor $1)\n- case $vendor in\n+ case \"$vendor\" in\nGCC|LLVM) command echo \"-fopenmp\" ;;\nINTEL|PATHSCALE) command echo \"-openmp\" ;;\nCRAY) command echo \"\" ;;\n@@ -439,9 +439,9 @@ function compilerOpenMPFlags {\n}\nfunction fCompilerModuleDirFlag {\n- local vendor=$(compilerVendor $1)\n+ local vendor=$(compilerVendor \"$1\")\n- case $vendor in\n+ case \"$vendor\" in\nGCC|CRAY) command echo \"-J\" ;;\nINTEL|PGI|PATHSCALE) command echo \"-module\" ;;\nIBM) command echo \"-qmoddir\" ;;\n@@ -450,26 +450,26 @@ function fCompilerModuleDirFlag {\n}\nfunction compilerSupportsOpenMP {\n- local compiler=$1\n- local vendor=$(compilerVendor $compiler)\n- local ompFlag=$(compilerOpenMPFlags $compiler)\n+ local compiler=\"$1\"\n+ local vendor=$(compilerVendor \"$compiler\")\n+ local ompFlag=$(compilerOpenMPFlags \"$compiler\")\n- local filename=${OCCA_DIR}/scripts/openmpTest.cpp\n- local binary=${OCCA_DIR}/scripts/openmpTest\n+ local filename=\"${OCCA_DIR}\"/scripts/openmpTest.cpp\n+ local binary=\"${OCCA_DIR}\"/scripts/openmpTest\n# Test compilation\n- $compiler $ompFlag $filename -o $binary > /dev/null 2>&1\n+ \"$compiler\" \"$ompFlag\" \"$filename\" -o \"$binary\" > /dev/null 2>&1\n- if [[ ! -a $binary ]]; then\n+ if [[ ! -a \"$binary\" ]]; then\ncommand echo 0\nreturn\nfi\n- if [[ $? -eq 0 ]]; then\n+ if [[ \"$?\" -eq 0 ]]; then\n# Test binary\n- $binary\n+ \"$binary\"\n- if [[ $? -eq 0 ]]; then\n+ if [[ \"$?\" -eq 0 ]]; then\ncommand echo 1\nelse\ncommand echo 0\n@@ -478,8 +478,8 @@ function compilerSupportsOpenMP {\ncommand echo 0\nfi\n- if [ ! -z $binary ]; then\n- rm -f $binary\n+ if [ ! -z \"$binary\" ]; then\n+ rm -f \"$binary\"\nfi\n}\n#=======================================\n@@ -491,7 +491,9 @@ function getFieldFrom {\nlocal field=\"$2\"\nif hash grep 2> /dev/null; then\n- command echo $(LC_ALL=C; $command_ | command grep -m 1 \"^$field\" | sed \"s/.*:[ \\t]*\\(.*\\)/\\1/g\")\n+ command echo $(LC_ALL=C; \"$command_\" | \\\n+ command grep -m 1 \"^$field\" | \\\n+ sed \"s/.*:[ \\t]*\\(.*\\)/\\1/g\")\nreturn\nfi\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Make] Quoted variables in shellTools
|
378,349 |
16.03.2017 19:55:57
| 18,000 |
8a5143b998260563b2cf1d6ad796bbf20120428c
|
[Make] Added additional CUDA header path
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/shellTools.sh",
"new_path": "scripts/shellTools.sh",
"diff": "@@ -67,7 +67,7 @@ function dirWithFileInPath {\nlocal filename=\"$2\"\nif [ ! -z \"$path\" ]; then\n- for dir_ in \"${path//:/ }\"; do\n+ for dir_ in ${path//:/ }; do\nif ls \"$dir_/$filename\" > /dev/null 2>&1; then\ncommand echo \"$dir_\"\nreturn\n@@ -83,7 +83,7 @@ function dirWithFileInIncludePath {\nlocal filename=\"$2\"\nif [ ! -z \"$path\" ]; then\n- for dir_ in \"${path//:/ }\"; do\n+ for dir_ in ${path//:/ }; do\nif ls \"$dir_/$filename\" > /dev/null 2>&1; then\ncommand echo \"$dir_\"\nreturn\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Make] Added additional CUDA header path
|
378,363 |
16.03.2017 21:04:19
| 25,200 |
4e2e928685f94b865011227ad4b4e2346cc3497d
|
Fix IBM compiler detection.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/compilerVendorTest.cpp",
"new_path": "scripts/compilerVendorTest.cpp",
"diff": "#define OCCA_NOT_FOUND 9\nint main(int argc, char **argv) {\n-#if defined(__clang__)\n- return OCCA_LLVM_VENDOR;\n+\n+#if defined(__xlc__) || defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__)\n+ return OCCA_IBM_VENDOR;\n#elif defined(__ICC) || defined(__INTEL_COMPILER)\nreturn OCCA_INTEL_VENDOR;\n@@ -44,9 +45,6 @@ int main(int argc, char **argv) {\n#elif defined(__HP_cc) || defined(__HP_aCC)\nreturn OCCA_HP_VENDOR;\n-#elif defined(__IBMC__) || defined(__IBMCPP__)\n- return OCCA_IBM_VENDOR;\n-\n#elif defined(__PGI)\nreturn OCCA_PGI_VENDOR;\n@@ -59,6 +57,9 @@ int main(int argc, char **argv) {\n#elif defined(_MSC_VER)\nreturn OCCA_VISUALSTUDIO_VENDOR;\n+#elif defined(__clang__)\n+ return OCCA_LLVM_VENDOR;\n+\n#else\nreturn OCCA_NOT_FOUND\n#endif\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
Fix IBM compiler detection. (#54)
|
378,349 |
19.03.2017 14:59:41
| 18,000 |
c74bd893fa2775f09985ca738d73f7fdb5cb86ac
|
[Defines] Removed OMP atomic from Serial kernel defines
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/cuda/memory.hpp",
"new_path": "include/occa/modes/cuda/memory.hpp",
"diff": "@@ -45,7 +45,7 @@ namespace occa {\n~memory();\nvoid* getHandle(const occa::properties &properties_) const;\n- kernelArg makeKernelArg() const const;\n+ kernelArg makeKernelArg() const;\nvoid copyTo(void *dest,\nconst udim_t bytes,\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/openmp/device.hpp",
"new_path": "include/occa/modes/openmp/device.hpp",
"diff": "@@ -36,7 +36,7 @@ namespace occa {\nkernel_v* buildKernel(const std::string &filename,\nconst std::string &kernelName,\n- const occa::properties &props) const;\n+ const occa::properties &props);\n};\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/serial/kernelDefines.hpp",
"new_path": "include/occa/modes/serial/kernelDefines.hpp",
"diff": "//---[ Atomics ]----------------------------------\n-template <class TM>\n-TM occaAtomicAdd(TM *ptr, const TM &update) {\n- const TM old = *ptr;\n- *ptr += update;\n+#define occaAtomicAdd(ptr, update) *(ptr) += (update)\n+#define occaAtomicSub(ptr, update) *(ptr) -= (update)\n- return old;\n-}\n+#define occaAtomicInc(ptr) ((*(ptr))++)\n+#define occaAtomicDec(ptr) ((*(ptr))--)\n-template <class TM>\n-TM occaAtomicSub(TM *ptr, const TM &update) {\n- const TM old = *ptr;\n- *ptr -= update;\n-\n- return old;\n-}\n+#define occaAtomicAnd(ptr, update) *(ptr) &= update\n+#define occaAtomicOr(ptr, update) *(ptr) |= update\n+#define occaAtomicXor(ptr, update) *(ptr) ^= update\ntemplate <class TM>\nTM occaAtomicSwap(TM *ptr, const TM &update) {\n@@ -60,22 +54,6 @@ TM occaAtomicSwap(TM *ptr, const TM &update) {\nreturn old;\n}\n-template <class TM>\n-TM occaAtomicInc(TM *ptr) {\n- const TM old = *ptr;\n- ++(*ptr);\n-\n- return old;\n-}\n-\n-template <class TM>\n-TM occaAtomicDec(TM *ptr, const TM &update) {\n- const TM old = *ptr;\n- --(*ptr);\n-\n- return old;\n-}\n-\ntemplate <class TM>\nTM occaAtomicMin(TM *ptr, const TM &update) {\nconst TM old = *ptr;\n@@ -92,41 +70,12 @@ TM occaAtomicMax(TM *ptr, const TM &update) {\nreturn old;\n}\n-template <class TM>\n-TM occaAtomicAnd(TM *ptr, const TM &update) {\n- const TM old = *ptr;\n- *ptr &= update;\n-\n- return old;\n-}\n-\n-template <class TM>\n-TM occaAtomicOr(TM *ptr, const TM &update) {\n- const TM old = *ptr;\n- *ptr |= update;\n-\n- return old;\n-}\n-\n-template <class TM>\n-TM occaAtomicXor(TM *ptr, const TM &update) {\n- const TM old = *ptr;\n- *ptr ^= update;\n-\n- return old;\n-}\n-\ntemplate <class TM>\nTM occaAtomicCAS(TM *ptr, const int comp, const TM &update) {\n- TM old;\n-\n-#pragma omp critical\n- {\n- old = *ptr;\n- if (comp)\n+ TM old = *ptr;\n+ if (comp) {\n*ptr = update;\n}\n-\nreturn old;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/device.cpp",
"new_path": "src/modes/cuda/device.cpp",
"diff": "@@ -93,7 +93,7 @@ namespace occa {\nif (props.get<std::string>(\"type\", \"\") == \"context\") {\nreturn (void*) context;\n}\n- return &handle;\n+ return (void*) &handle;\n}\nvoid device::finish() const {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/openmp/device.cpp",
"new_path": "src/modes/openmp/device.cpp",
"diff": "@@ -53,7 +53,7 @@ namespace occa {\nkernel_v* device::buildKernel(const std::string &filename,\nconst std::string &kernelName,\n- const occa::properties &props) const {\n+ const occa::properties &props) {\nkernel *k = new kernel();\nk->dHandle = this;\nk->build(filename, kernelName, props);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Defines] Removed OMP atomic from Serial kernel defines
|
378,349 |
20.03.2017 01:13:16
| 14,400 |
318b852d53a1533f7895849b83bb1ab0a01c251d
|
[Memory] Added entries method
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/memory.hpp",
"new_path": "include/occa/memory.hpp",
"diff": "@@ -145,6 +145,14 @@ namespace occa {\nudim_t size() const;\n+ template <class TM>\n+ udim_t entries() const {\n+ if (mHandle == NULL) {\n+ return 0;\n+ }\n+ return (mHandle->size / sizeof(TM));\n+ }\n+\nbool isManaged() const;\nbool inDevice() const;\nbool isStale() const;\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Memory] Added entries method
|
378,349 |
26.03.2017 21:42:21
| 18,000 |
abc9a6c4eab385e7f73d4280e7690ddf36db978e
|
[UVA] Renamed uvaAlloc to umalloc
|
[
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -169,7 +169,7 @@ test:\nmake -j 4 CXXFLAGS='-g' FCFLAGS='-g' && \\\n./main\n- cd $(OCCA_DIR)/examples/uvaAddVectors/ && \\\n+ cd $(OCCA_DIR)/examples/unifiedMemoryAddVectors/ && \\\nrm -f main && \\\nmake -j 4 CXXFLAGS='-g' FCFLAGS='-g'; \\\n./main\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/backgroundDevices/main.cpp",
"new_path": "examples/backgroundDevices/main.cpp",
"diff": "@@ -9,14 +9,13 @@ int main(int argc, char **argv) {\n// occa::setDevice(\"mode: 'OpenMP'\")\n// occa::device device(\"mode : 'OpenCL', \"\n// \"platformID : 0, \"\n- // \"deviceID : 0, \"\n- // \"uva : true\");\n+ // \"deviceID : 0\");\n// occa::device = occa::currentDevice();\n// Use the default device (mode = Serial)\n- float *a = (float*) occa::uvaAlloc(entries * sizeof(float));\n- float *b = (float*) occa::uvaAlloc(entries * sizeof(float));\n- float *ab = (float*) occa::uvaAlloc(entries * sizeof(float));\n+ float *a = (float*) occa::umalloc(entries * sizeof(float));\n+ float *b = (float*) occa::umalloc(entries * sizeof(float));\n+ float *ab = (float*) occa::umalloc(entries * sizeof(float));\nfor (int i = 0; i < entries; ++i) {\na[i] = i;\n"
},
{
"change_type": "RENAME",
"old_path": "examples/uvaAddVectors/.gitignore",
"new_path": "examples/unifiedMemoryAddVectors/.gitignore",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "examples/uvaAddVectors/Makefile",
"new_path": "examples/unifiedMemoryAddVectors/Makefile",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "examples/uvaAddVectors/addVectors.okl",
"new_path": "examples/unifiedMemoryAddVectors/addVectors.okl",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "examples/uvaAddVectors/main.cpp",
"new_path": "examples/unifiedMemoryAddVectors/main.cpp",
"diff": "int main(int argc, char **argv) {\nint entries = 5;\n- // [U]nified [V]irtual [A]dressing is\n- // disabled by default\n- // occa::enableUVAByDefault();\nocca::device device(\"mode : 'OpenCL', \"\n\"platformID : 0, \"\n- \"deviceID : 0, \"\n- \"uva : true\");\n-\n- // Allocate [uva] arrays that will\n- // automatically synchronize between\n- // the process and [device]\n- float *a = (float*) device.uvaAlloc(entries * sizeof(float));\n- float *b = (float*) device.uvaAlloc(entries * sizeof(float));\n- float *ab = (float*) device.uvaAlloc(entries * sizeof(float));\n+ \"deviceID : 0\");\n+\n+ // umalloc: [U]nified [M]emory [Alloc]ation\n+ // Allocate host memory that auto-syncs with the device\n+ // between before kernel calls and device::finish()\n+ // if needed.\n+ float *a = (float*) device.umalloc(entries * sizeof(float));\n+ float *b = (float*) device.umalloc(entries * sizeof(float));\n+ float *ab = (float*) device.umalloc(entries * sizeof(float));\nfor (int i = 0; i < entries; ++i) {\na[i] = i;\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/array/array.tpp",
"new_path": "include/occa/array/array.tpp",
"diff": "@@ -285,7 +285,7 @@ namespace occa {\n//---[ allocate(...) ]----------------\ntemplate <class TM, const int idxType>\nvoid array<TM,idxType>::allocate() {\n- data_ = (TM*) device.uvaAlloc(bytes());\n+ data_ = (TM*) device.umalloc(bytes());\nmemory_ = occa::memory(data_);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/base.hpp",
"new_path": "include/occa/base.hpp",
"diff": "@@ -85,7 +85,7 @@ namespace occa {\nconst void *src = NULL,\nconst occa::properties &props = occa::properties());\n- void* uvaAlloc(const dim_t bytes,\n+ void* umalloc(const dim_t bytes,\nconst void *src = NULL,\nconst occa::properties &props = occa::properties());\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/device.hpp",
"new_path": "include/occa/device.hpp",
"diff": "@@ -42,9 +42,10 @@ namespace occa {\nclass streamTag;\n//---[ device_v ]---------------------\n- class device_v : public hasProperties {\n+ class device_v {\npublic:\nstd::string mode;\n+ occa::properties properties;\nptrRangeMap_t uvaMap;\nmemoryVector_t uvaStaleMemory;\n@@ -174,7 +175,7 @@ namespace occa {\nconst void *src = NULL,\nconst occa::properties &props = occa::properties());\n- void* uvaAlloc(const dim_t bytes,\n+ void* umalloc(const dim_t bytes,\nconst void *src = NULL,\nconst occa::properties &props = occa::properties());\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/lang/c/c_wrapper.hpp",
"new_path": "include/occa/lang/c/c_wrapper.hpp",
"diff": "@@ -162,7 +162,7 @@ OCCA_LFUNC occaMemory OCCA_RFUNC occaMalloc(const occaUDim_t bytes,\nconst void *src,\noccaProperties props);\n-OCCA_LFUNC void* OCCA_RFUNC occaUvaAlloc(const occaUDim_t bytes,\n+OCCA_LFUNC void* OCCA_RFUNC occaUmalloc(const occaUDim_t bytes,\nconst void *src,\noccaProperties props);\n@@ -203,7 +203,7 @@ OCCA_LFUNC occaMemory OCCA_RFUNC occaDeviceMalloc(occaDevice device,\nconst void *src,\noccaProperties props);\n-OCCA_LFUNC void* OCCA_RFUNC occaDeviceUvaAlloc(occaDevice device,\n+OCCA_LFUNC void* OCCA_RFUNC occaDeviceUmalloc(occaDevice device,\nconst occaUDim_t bytes,\nconst void *src,\noccaProperties props);\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/properties.hpp",
"new_path": "include/occa/tools/properties.hpp",
"diff": "@@ -44,11 +44,6 @@ namespace occa {\nreturn ret;\n}\n};\n-\n- class hasProperties {\n- public:\n- occa::properties properties;\n- };\n}\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "src/base.cpp",
"new_path": "src/base.cpp",
"diff": "@@ -126,11 +126,11 @@ namespace occa {\nreturn currentDevice().malloc(bytes, src, props);\n}\n- void* uvaAlloc(const dim_t bytes,\n+ void* umalloc(const dim_t bytes,\nconst void *src,\nconst occa::properties &props) {\n- return currentDevice().uvaAlloc(bytes, src, props);\n+ return currentDevice().umalloc(bytes, src, props);\n}\nocca::memory wrapMemory(void *handle_,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/device.cpp",
"new_path": "src/device.cpp",
"diff": "namespace occa {\n//---[ device_v ]---------------------\n- device_v::device_v(const occa::properties &properties_) :\n- hasProperties() {\n-\n+ device_v::device_v(const occa::properties &properties_) {\nmode = properties_[\"mode\"].string();\nproperties = properties_;\n@@ -327,7 +325,7 @@ namespace occa {\nreturn mem;\n}\n- void* device::uvaAlloc(const dim_t bytes,\n+ void* device::umalloc(const dim_t bytes,\nconst void *src,\nconst occa::properties &props) {\nOCCA_ERROR(\"Trying to allocate negative bytes (\" << bytes << \")\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/lang/c/c_wrapper.cpp",
"new_path": "src/lang/c/c_wrapper.cpp",
"diff": "@@ -553,12 +553,12 @@ occaMemory OCCA_RFUNC occaMalloc(const occaUDim_t bytes,\nreturn memory;\n}\n-void* OCCA_RFUNC occaUvaAlloc(const occaUDim_t bytes,\n+void* OCCA_RFUNC occaUmalloc(const occaUDim_t bytes,\nconst void *src,\noccaProperties props) {\nocca::properties &props_ = occa::c::getProperties(props);\n- return occa::uvaAlloc(bytes, src, props_);\n+ return occa::umalloc(bytes, src, props_);\n}\noccaMemory OCCA_RFUNC occaWrapMemory(void *handle_,\n@@ -663,14 +663,14 @@ occaMemory OCCA_RFUNC occaDeviceMalloc(occaDevice device,\nreturn memory;\n}\n-void* OCCA_RFUNC occaDeviceUvaAlloc(occaDevice device,\n+void* OCCA_RFUNC occaDeviceUmalloc(occaDevice device,\nconst occaUDim_t bytes,\nconst void *src,\noccaProperties props) {\nocca::device device_ = occa::c::getDevice(device);\nocca::properties &props_ = occa::c::getProperties(props);\n- return device_.uvaAlloc(bytes, src, props_);\n+ return device_.umalloc(bytes, src, props_);\n}\noccaMemory OCCA_RFUNC occaDeviceWrapMemory(occaDevice device,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/memory.cpp",
"new_path": "src/memory.cpp",
"diff": "@@ -74,15 +74,12 @@ namespace occa {\nmHandle(NULL) {}\nmemory::memory(void *uvaPtr) {\n- // Default to uvaPtr is actually a memory_v*\n- memory_v *mHandle_ = (memory_v*) uvaPtr;\nptrRangeMap_t::iterator it = uvaMap.find(uvaPtr);\n-\nif (it != uvaMap.end()) {\n- mHandle_ = it->second;\n+ mHandle = it->second;\n+ } else {\n+ mHandle = (memory_v*) uvaPtr;\n}\n-\n- mHandle = mHandle_;\n}\nmemory::memory(memory_v *mHandle_) :\n@@ -92,9 +89,9 @@ namespace occa {\nmHandle(m.mHandle) {}\nmemory& memory::swap(memory &m) {\n- memory_v *tmp = mHandle;\n+ memory_v *mHandle_ = mHandle;\nmHandle = m.mHandle;\n- m.mHandle = tmp;\n+ m.mHandle = mHandle_;\nreturn *this;\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[UVA] Renamed uvaAlloc to umalloc
|
378,349 |
29.03.2017 22:02:44
| 18,000 |
6a5c613c9d8e17f5dcfd02db8a8b8b6cda1024e2
|
[MPI] Fixed hash usage for buildKernel
|
[
{
"change_type": "MODIFY",
"old_path": "src/device.cpp",
"new_path": "src/device.cpp",
"diff": "@@ -306,12 +306,14 @@ namespace occa {\nif (!io::haveHash(hash, hashTag)) {\nio::waitForHash(hash, hashTag);\n- return buildKernelFromBinary(hashDir + kc::binaryFile,\n+ return buildKernel(stringSourceFile,\nkernelName,\n- props);\n+ allProps);\n}\n+ if (!sys::fileExists(stringSourceFile)) {\nio::write(stringSourceFile, content);\n+ }\nkernel k = buildKernel(stringSourceFile,\nkernelName,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/io.cpp",
"new_path": "src/tools/io.cpp",
"diff": "@@ -372,8 +372,9 @@ namespace occa {\nint mkdirStatus = sys::mkdir(lockDir);\n- if (mkdirStatus && (errno == EEXIST))\n+ if (mkdirStatus && (errno == EEXIST)) {\nreturn false;\n+ }\nfileLocks[lockDir] = hashAndTag(hash, tag);\n@@ -414,12 +415,21 @@ namespace occa {\nstd::string parsedContent = fileParser.parseFile(io::filename(filename), properties);\nif (!sys::fileExists(parsedFile)) {\n+ hash_t hash = occa::hash(parsedFile);\n+ const std::string hashTag = \"parse-file\";\n+\n+ if (io::haveHash(hash, hashTag)) {\nsys::mkpath(dirname(parsedFile));\nstd::ofstream fs;\nfs.open(parsedFile.c_str());\nfs << parsedContent;\nfs.close();\n+\n+ io::releaseHash(hash, hashTag);\n+ } else {\n+ io::waitForHash(hash, hashTag);\n+ }\n}\nkernelInfoIterator kIt = fileParser.kernelInfoMap.find(functionName);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[MPI] Fixed hash usage for buildKernel
|
378,349 |
31.03.2017 19:53:06
| 18,000 |
df343db5353ed8a9ed4b966efa14596b2b39221b
|
[Memory] Added + operator for creating memory offsets
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/memory.hpp",
"new_path": "include/occa/memory.hpp",
"diff": "@@ -76,6 +76,8 @@ namespace occa {\nvirtual void* getHandle(const occa::properties &props) const = 0;\nvirtual kernelArg makeKernelArg() const = 0;\n+ virtual memory_v* addOffset(const dim_t offset, bool &needsFree) = 0;\n+\nvirtual void copyTo(void *dest,\nconst udim_t bytes,\nconst udim_t offset = 0,\n@@ -180,6 +182,8 @@ namespace occa {\nvoid uvaMarkStale();\nvoid uvaMarkFresh();\n+ occa::memory operator + (const dim_t offset);\n+\nvoid copyFrom(const void *src,\nconst dim_t bytes = -1,\nconst dim_t offset = 0,\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/cuda/memory.hpp",
"new_path": "include/occa/modes/cuda/memory.hpp",
"diff": "@@ -47,6 +47,8 @@ namespace occa {\nvoid* getHandle(const occa::properties &properties_) const;\nkernelArg makeKernelArg() const;\n+ memory_v* addOffset(const dim_t offset, bool &needsFree);\n+\nvoid copyTo(void *dest,\nconst udim_t bytes,\nconst udim_t destOffset = 0,\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/opencl/memory.hpp",
"new_path": "include/occa/modes/opencl/memory.hpp",
"diff": "@@ -46,6 +46,8 @@ namespace occa {\nvoid* getHandle(const occa::properties &properties_) const;\nkernelArg makeKernelArg() const;\n+ memory_v* addOffset(const dim_t offset, bool &needsFree);\n+\nvoid copyTo(void *dest,\nconst udim_t bytes,\nconst udim_t destOffset = 0,\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/serial/memory.hpp",
"new_path": "include/occa/modes/serial/memory.hpp",
"diff": "@@ -36,6 +36,8 @@ namespace occa {\nvoid* getHandle(const occa::properties &props) const;\nkernelArg makeKernelArg() const;\n+ memory_v* addOffset(const dim_t offset, bool &needsFree);\n+\nvoid copyTo(void *dest,\nconst udim_t bytes,\nconst udim_t destOffset,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/memory.cpp",
"new_path": "src/memory.cpp",
"diff": "@@ -271,6 +271,18 @@ namespace occa {\n}\n}\n+ occa::memory memory::operator + (const dim_t offset) {\n+ OCCA_ERROR(\"Cannot have a negative offset (\" << offset << \")\",\n+ offset >= 0);\n+\n+ bool needsFree;\n+ occa::memory m(mHandle->addOffset(offset, needsFree));\n+ if (!needsFree) {\n+ m.dontUseRefs();\n+ }\n+ return m;\n+ }\n+\nvoid memory::copyFrom(const void *src,\nconst dim_t bytes,\nconst dim_t offset,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/memory.cpp",
"new_path": "src/modes/cuda/memory.cpp",
"diff": "@@ -51,6 +51,16 @@ namespace occa {\nreturn kArg;\n}\n+ memory_v* memory::addOffset(const dim_t offset, bool &needsFree) {\n+ memory *m = new memory(properties);\n+ m->handle = (((char*) handle) + offset);\n+ if (mappedPtr) {\n+ m->mappedPtr = (((char*) mappedPtr) + offset);\n+ }\n+ needsFree = false;\n+ return m;\n+ };\n+\nvoid memory::copyFrom(const void *src,\nconst udim_t bytes,\nconst udim_t offset,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/opencl/device.cpp",
"new_path": "src/modes/opencl/device.cpp",
"diff": "@@ -235,10 +235,12 @@ namespace occa {\n*((cl_mem*) mem->handle) = clCreateBuffer(clContext,\nCL_MEM_READ_WRITE,\nbytes, NULL, &error);\n+ OCCA_OPENCL_ERROR(\"Device: clCreateBuffer\", error);\n} else {\n*((cl_mem*) mem->handle) = clCreateBuffer(clContext,\nCL_MEM_READ_WRITE | CL_MEM_COPY_HOST_PTR,\nbytes, const_cast<void*>(src), &error);\n+ OCCA_OPENCL_ERROR(\"Device: clCreateBuffer\", error);\nfinish();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/opencl/memory.cpp",
"new_path": "src/modes/opencl/memory.cpp",
"diff": "@@ -52,6 +52,29 @@ namespace occa {\nreturn kArg;\n}\n+ memory_v* memory::addOffset(const dim_t offset, bool &needsFree) {\n+ opencl::device &dev = *((opencl::device*) dHandle);\n+ opencl::memory *m = new opencl::memory();\n+ m->dHandle = &dev;\n+ m->handle = new cl_mem;\n+ m->size = size - offset;\n+\n+ cl_buffer_region info;\n+ info.origin = offset;\n+ info.size = m->size;\n+\n+ cl_int error;\n+ *((cl_mem*) m->handle) = clCreateSubBuffer(*((cl_mem*) handle),\n+ CL_MEM_READ_WRITE,\n+ CL_BUFFER_CREATE_TYPE_REGION,\n+ &info,\n+ &error);\n+\n+ OCCA_OPENCL_ERROR(\"Device: clCreateSubBuffer\", error);\n+ needsFree = true;\n+ return m;\n+ }\n+\nvoid memory::copyFrom(const void *src,\nconst udim_t bytes,\nconst udim_t offset,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/serial/memory.cpp",
"new_path": "src/modes/serial/memory.cpp",
"diff": "@@ -43,6 +43,13 @@ namespace occa {\nreturn kArg;\n}\n+ memory_v* memory::addOffset(const dim_t offset, bool &needsFree) {\n+ memory *m = new memory(properties);\n+ m->handle = (((char*) handle) + offset);\n+ needsFree = false;\n+ return m;\n+ }\n+\nvoid memory::copyTo(void *dest,\nconst udim_t bytes,\nconst udim_t offset,\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Memory] Added + operator for creating memory offsets
|
378,349 |
31.03.2017 19:59:01
| 18,000 |
791834681b2667071745991ffcf951f2bbf64baa
|
[Kernel] setRunDims now takes (outer,inner) instead of (inner,outer) to match CUDA format
|
[
{
"change_type": "MODIFY",
"old_path": "examples/nativeAddVectors/main.cpp",
"new_path": "examples/nativeAddVectors/main.cpp",
"diff": "@@ -42,7 +42,7 @@ int main(int argc, char **argv) {\no_a.copyFrom(a);\no_b.copyFrom(b);\n- addVectors.setRunDims(16, (entries + 15) / 16);\n+ addVectors.setRunDims((entries + 15) / 16, 16);\naddVectors(entries, o_a, o_b, o_ab);\no_ab.copyTo(ab);\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/kernel.hpp",
"new_path": "include/occa/kernel.hpp",
"diff": "@@ -237,7 +237,7 @@ namespace occa {\ndim maxOuterDims();\ndim maxInnerDims();\n- void setRunDims(dim inner, dim outer);\n+ void setRunDims(dim outer, dim inner);\nvoid addArgument(const int argPos, const kernelArg &arg);\nvoid runFromArguments() const;\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/lang/c/c_wrapper.hpp",
"new_path": "include/occa/lang/c/c_wrapper.hpp",
"diff": "@@ -240,12 +240,8 @@ OCCA_LFUNC const char* OCCA_RFUNC occaKernelName(occaKernel kernel);\nOCCA_LFUNC occaDevice OCCA_RFUNC occaKernelGetDevice(occaKernel kernel);\nOCCA_LFUNC void OCCA_RFUNC occaKernelSetRunDims(occaKernel kernel,\n- occaDim items,\n- occaDim groups);\n-\n-OCCA_LFUNC void OCCA_RFUNC occaKernelSetAllRunDims(occaKernel kernel,\n- occaUDim_t itemsX, occaUDim_t itemsY, occaUDim_t itemsZ,\n- occaUDim_t groupsX, occaUDim_t groupsY, occaUDim_t groupsZ);\n+ occaDim groups,\n+ occaDim items);\nOCCA_LFUNC occaArgumentList OCCA_RFUNC occaCreateArgumentList();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/kernel.cpp",
"new_path": "src/kernel.cpp",
"diff": "@@ -354,7 +354,7 @@ namespace occa {\nreturn kHandle->binaryFilename;\n}\n- void kernel::setRunDims(occa::dim inner, occa::dim outer) {\n+ void kernel::setRunDims(occa::dim outer, occa::dim inner) {\nkHandle->inner = inner;\nkHandle->outer = outer;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/lang/c/c_wrapper.cpp",
"new_path": "src/lang/c/c_wrapper.cpp",
"diff": "@@ -807,21 +807,12 @@ occaDevice OCCA_RFUNC occaKernelGetDevice(occaKernel kernel) {\n}\nvoid OCCA_RFUNC occaKernelSetRunDims(occaKernel kernel,\n- occaDim items,\n- occaDim groups) {\n+ occaDim groups,\n+ occaDim items) {\nocca::kernel kernel_ = occa::c::getKernel(kernel);\n- kernel_.setRunDims(occa::dim(items.x, items.y, items.z),\n- occa::dim(groups.x, groups.y, groups.z));\n-}\n-\n-void OCCA_RFUNC occaKernelSetRunAllDims(occaKernel kernel,\n- occaUDim_t itemsX, occaUDim_t itemsY, occaUDim_t itemsZ,\n- occaUDim_t groupsX, occaUDim_t groupsY, occaUDim_t groupsZ) {\n-\n- occa::kernel kernel_ = occa::c::getKernel(kernel);\n- kernel_.setRunDims(occa::dim(itemsX, itemsY, itemsZ),\n- occa::dim(groupsX, groupsY, groupsZ));\n+ kernel_.setRunDims(occa::dim(groups.x, groups.y, groups.z),\n+ occa::dim(items.x, items.y, items.z));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/parser/parser.cpp",
"new_path": "src/parser/parser.cpp",
"diff": "@@ -2805,7 +2805,7 @@ namespace occa {\nss << \"inner[\" << i << \"] = \" << iterExps[1][i] << \";\\n\";\n}\n- ss << \"nestedKernels[\" << newKernelPos << \"].setRunDims(inner, outer);\\n\"\n+ ss << \"nestedKernels[\" << newKernelPos << \"].setRunDims(outer, inner);\\n\"\n<< \"nestedKernels[\" << newKernelPos << \"](\";\nconst int argCount = newKernelVar.argumentCount;\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Kernel] setRunDims now takes (outer,inner) instead of (inner,outer) to match CUDA format
|
378,349 |
31.03.2017 22:30:06
| 18,000 |
2408da98e7fa18c1e250f04c112b96685763ac5b
|
[Make] Fixed sed issue with OSX
|
[
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -83,15 +83,15 @@ COMPILED_DEFINES_CHANGED := $(OCCA_DIR)/.compiledDefinesChanged\nMAKE_COMPILED_DEFINES := $(shell touch \"$(NEW_COMPILED_DEFINES)\")\nMAKE_COMPILED_DEFINES := $(shell cp \"$(NEW_COMPILED_DEFINES)\" \"$(OLD_COMPILED_DEFINES)\")\n-MAKE_COMPILED_DEFINES := $(shell cp \"$(OCCA_DIR)/scripts/compiledDefinesTemplate.hpp\" \"$(NEW_COMPILED_DEFINES)\")\n-MAKE_COMPILED_DEFINES := $(shell sed -i \"s,@@OCCA_OS@@,$(OCCA_OS),g;\\\n+MAKE_COMPILED_DEFINES := $(shell cat \"$(OCCA_DIR)/scripts/compiledDefinesTemplate.hpp\" | \\\n+ sed \"s,@@OCCA_OS@@,$(OCCA_OS),g;\\\ns,@@OCCA_USING_VS@@,$(OCCA_USING_VS),g;\\\ns,@@OCCA_COMPILED_DIR@@,\\\"$(OCCA_DIR)\\\",g;\\\ns,@@OCCA_DEBUG_ENABLED@@,$(OCCA_DEBUG_ENABLED),g;\\\ns,@@OCCA_CHECK_ENABLED@@,$(OCCA_CHECK_ENABLED),g;\\\ns,@@OCCA_OPENMP_ENABLED@@,$(OCCA_OPENMP_ENABLED),g;\\\ns,@@OCCA_OPENCL_ENABLED@@,$(OCCA_OPENCL_ENABLED),g;\\\n- s,@@OCCA_CUDA_ENABLED@@,$(OCCA_CUDA_ENABLED),g\" \"$(NEW_COMPILED_DEFINES)\")\n+ s,@@OCCA_CUDA_ENABLED@@,$(OCCA_CUDA_ENABLED),g\" > \"$(NEW_COMPILED_DEFINES)\")\nMAKE_COMPILED_DEFINES := $(shell [ -n \"$(shell diff -q $(OLD_COMPILED_DEFINES) $(NEW_COMPILED_DEFINES))\" ] && touch \"$(COMPILED_DEFINES_CHANGED)\")\nMAKE_COMPILED_DEFINES := $(shell rm $(OLD_COMPILED_DEFINES))\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Make] Fixed sed issue with OSX
|
378,349 |
01.04.2017 20:18:25
| 18,000 |
cde0920c9fcbf031c08c41b8e750ddcbf5478c46
|
[Parser] Added if status logic
|
[
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/include/preprocessor.hpp",
"new_path": "parser_sandbox/include/preprocessor.hpp",
"diff": "@@ -85,6 +85,7 @@ namespace occa {\nstatic directiveTrie_t& getDirectiveTrie();\nvoid pushStatus(const int status);\n+ int popStatus();\nvoid setFilename(const std::string &filename, const bool add = true);\n@@ -168,6 +169,11 @@ namespace occa {\nupdatingSkipToWhitespace((const char *&) c);\n}\n//==================================\n+\n+ template <class TM>\n+ TM eval(const std::string &s) {\n+ return TM();\n+ }\n};\n}\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "parser_sandbox/src/preprocessor.cpp",
"new_path": "parser_sandbox/src/preprocessor.cpp",
"diff": "@@ -15,7 +15,8 @@ namespace occa {\n//|-----[ Status ]--------------------\nstatic const int reading = (1 << 0);\nstatic const int ignoring = (1 << 1);\n- static const int finishedIf = (1 << 2);\n+ static const int foundElse = (1 << 2);\n+ static const int finishedIf = (1 << 3);\n//|===================================\npreprocessor_t::status_t::status_t() {}\n@@ -156,6 +157,17 @@ namespace occa {\ncurrentStatus.filePosition = currentFrame.filePosition;\n}\n+ int preprocessor_t::popStatus() {\n+ const int pos = (int) statusStack.size() - 1;\n+ if (pos >= 0) {\n+ currentStatus.status = statusStack[pos].status;\n+ currentStatus.filePosition = statusStack[pos].filePosition;\n+ statusStack.pop_back();\n+ return currentStatus.status;\n+ }\n+ return 0;\n+ }\n+\nvoid preprocessor_t::setFilename(const std::string &filename, const bool add) {\nif (add) {\nallFilenames.add(filename, filename);\n@@ -185,8 +197,7 @@ namespace occa {\ncurrentFrame = frames[frames.size() - 1];\nframes.pop_back();\n- if ((frames.size() == 0) &&\n- (0 < statusStack.size())) {\n+ if (!frames.size() && statusStack.size()) {\nprintError(\"#if without a closing #endif\",\ncurrentStatus.filePosition);\n}\n@@ -285,9 +296,10 @@ namespace occa {\nreturn;\n}\n- // Parse #if[,def], #el[se,if], #endif even when ignored\n- // For some reason the preprocessor honors ignored #if/#el/#endif stacks\n+ // Parse #if[,def], #el[se,if], #end[if] even when ignored\n+ // The preprocessor honors ignored #if/#el/#endif stacks\nconst int status = currentStatus.status;\n+\nif (!(status & ignoring) ||\n(strncmp(cStart, \"if\" , 2) &&\nstrncmp(cStart, \"el\" , 2) &&\n@@ -302,69 +314,99 @@ namespace occa {\nchar *cStart = c;\nupdatingSkipTo(c, '\\n');\n- int &status = currentStatus.status;\n- if (status & ignoring) {\n- pushStatus(ignoring | finishedIf);\n- return;\n- }\n+ int status = currentStatus.status;\n+ if (!(status & ignoring)) {\nstd::string line;\napplyMacros(cStart, c - cStart, line);\n-\n- status |= finishedIf;\n+ pushStatus(eval<bool>(line) ? reading : ignoring);\n+ } else {\n+ pushStatus(finishedIf);\n+ }\n}\nvoid preprocessor_t::processIfdef(char *&dStart, char *&c) {\nchar *cStart = c;\nupdatingSkipTo(c, '\\n');\n- int &status = currentStatus.status;\n- if (status & ignoring) {\n- pushStatus(ignoring | finishedIf);\n- return;\n- }\n+ int status = currentStatus.status;\n+ if (!(status & ignoring)) {\nstd::string line;\napplyMacros(cStart, c - cStart, line);\n- const macro_t *macro = getMacro(&(line[0]), line.size());\n- status |= (macro != NULL) ? ignoring : finishedIf;\n+ const macro_t *macro = getMacro(&(line[0]), line.size());\n+ pushStatus(macro != NULL ? reading : ignoring);\n+ } else {\n+ pushStatus(finishedIf);\n+ }\n}\nvoid preprocessor_t::processIfndef(char *&dStart, char *&c) {\n- processIfdef(dStart, c);\n- int &status = currentStatus.status;\n- // Ifdef already set finishedIf so we can return\n- if (status & ignoring) {\n- return;\n+ char *cStart = c;\n+ updatingSkipTo(c, '\\n');\n+\n+ int status = currentStatus.status;\n+\n+ if (!(status & ignoring)) {\n+ std::string line;\n+ applyMacros(cStart, c - cStart, line);\n+\n+ const macro_t *macro = getMacro(&(line[0]), line.size());\n+ pushStatus(macro == NULL ? reading : ignoring);\n+ } else {\n+ pushStatus(finishedIf);\n}\n- // Do the opposite as Ifdef\n- status ^= finishedIf;\n}\nvoid preprocessor_t::processElif(char *&dStart, char *&c) {\n- processIf(dStart, c);\n+ char *cStart = c;\n+ updatingSkipTo(c, '\\n');\n+\n+ int status = currentStatus.status;\n+\n+ if (!statusStack.size()) {\n+ printError(\"#elif without #if\", cStart);\n+ }\n+\n+ if (status & ignoring) {\n+ std::string line;\n+ applyMacros(cStart, c - cStart, line);\n+ pushStatus(eval<bool>(line) ? reading : ignoring);\n+ } else {\n+ pushStatus(finishedIf);\n+ }\n}\nvoid preprocessor_t::processElse(char *&dStart, char *&c) {\n- int &status = currentStatus.status;\n- if (status & finishedIf) {\n+ char *cStart = c;\nupdatingSkipTo(c, '\\n');\n- return;\n+\n+ int status = currentStatus.status;\n+\n+ if (!statusStack.size()) {\n+ printError(\"#else without #if\", cStart);\n+ }\n+ if (status & foundElse) {\n+ printError(\"Found two #else directives\", cStart);\n+ }\n+\n+ if (status & ignoring) {\n+ std::string line;\n+ applyMacros(cStart, c - cStart, line);\n+ pushStatus(foundElse | (eval<bool>(line) ? reading : ignoring));\n+ } else {\n+ pushStatus(foundElse | finishedIf);\n}\n- status |= finishedIf;\n}\nvoid preprocessor_t::processEndif(char *&dStart, char *&c) {\nconst char *cStart = c;\nupdatingSkipTo(c, '\\n');\n- if ((statusStack.size() == 0) ||\n- (currentStatus.status & ignoring)) {\n+ if (!popStatus()) {\nprintError(\"#endif without #if\", cStart);\n}\n-\n- statusStack.pop_back();\n}\nvoid preprocessor_t::processDefine(char *&dStart, char *&c) {\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Parser] Added if status logic
|
378,349 |
05.04.2017 16:56:47
| 18,000 |
3f372b3792131b04fa4eebc1ec57e13178138d0c
|
[OpenMP] Fixed OpenMP kernel defines
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/openmp/kernelDefines.hpp",
"new_path": "include/occa/modes/openmp/kernelDefines.hpp",
"diff": "@@ -223,10 +223,10 @@ TM occaAtomicCAS(TM *ptr, const int comp, const TM &update) {\n//---[ Misc ]-------------------------------------\n-#define occaParallelFor2 OCCA_PRAGMA(\"omp parallel for collapse(3) firstprivate(occaInnerId0,occaInnerId1,occaInnerId2)\")\n-#define occaParallelFor1 OCCA_PRAGMA(\"omp parallel for collapse(2) firstprivate(occaInnerId0,occaInnerId1,occaInnerId2)\")\n-#define occaParallelFor0 OCCA_PRAGMA(\"omp parallel for firstprivate(occaInnerId0,occaInnerId1,occaInnerId2)\")\n-#define occaParallelFor OCCA_PRAGMA(\"omp parallel for firstprivate(occaInnerId0,occaInnerId1,occaInnerId2)\")\n+#define occaParallelFor2 OCCA_PRAGMA(\"omp parallel for collapse(3) firstprivate(occaKernelInfoArg_)\")\n+#define occaParallelFor1 OCCA_PRAGMA(\"omp parallel for collapse(2) firstprivate(occaKernelInfoArg_)\")\n+#define occaParallelFor0 OCCA_PRAGMA(\"omp parallel for firstprivate(occaKernelInfoArg_)\")\n+#define occaParallelFor OCCA_PRAGMA(\"omp parallel for firstprivate(occaKernelInfoArg_)\")\n//================================================\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/memory.cpp",
"new_path": "src/modes/cuda/memory.cpp",
"diff": "@@ -37,7 +37,7 @@ namespace occa {\nmemory::~memory() {}\nvoid* memory::getHandle(const occa::properties &properties_) const {\n- if (properties_.get<std::string>(\"type\", \"\") == \"mapped\") {\n+ if (props.get<bool>(\"mapped\", false)) {\nreturn mappedPtr;\n}\nreturn handle;\n@@ -129,6 +129,7 @@ namespace occa {\nif (mappedPtr) {\nOCCA_CUDA_ERROR(\"Device: mappedFree()\",\ncuMemFreeHost(mappedPtr));\n+ mappedPtr = NULL;\n} else if (handle) {\ncuMemFree(*((CUdeviceptr*) handle));\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[OpenMP] Fixed OpenMP kernel defines
|
378,349 |
06.04.2017 18:37:49
| 18,000 |
c5c0a47f0b7fb721ca3b1336aee00e5ebb7f9c78
|
[CUDA] Wrong arg name in getHandle
|
[
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/memory.cpp",
"new_path": "src/modes/cuda/memory.cpp",
"diff": "@@ -37,7 +37,7 @@ namespace occa {\nmemory::~memory() {}\nvoid* memory::getHandle(const occa::properties &properties_) const {\n- if (props.get<bool>(\"mapped\", false)) {\n+ if (properties_.get<bool>(\"mapped\", false)) {\nreturn mappedPtr;\n}\nreturn handle;\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[CUDA] Wrong arg name in getHandle
|
378,349 |
06.04.2017 19:48:20
| 18,000 |
b92278f53e542a3c2c6eeecc09d851f9a22706ab
|
[sys] Added 2 more signal catches
|
[
{
"change_type": "MODIFY",
"old_path": "src/tools/env.cpp",
"new_path": "src/tools/env.cpp",
"diff": "@@ -65,6 +65,8 @@ namespace occa {\n#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_OSX_OS))\n::signal(SIGKILL, env::signalExit);\n::signal(SIGQUIT, env::signalExit);\n+ ::signal(SIGUSR1, env::signalExit);\n+ ::signal(SIGUSR2, env::signalExit);\n#endif\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/sys.cpp",
"new_path": "src/tools/sys.cpp",
"diff": "@@ -135,8 +135,9 @@ namespace occa {\nsize_t lineBytes = 512;\nchar lineBuffer[512];\n- while(fgets(lineBuffer, lineBytes, fp))\n+ while (fgets(lineBuffer, lineBytes, fp)) {\noutput += lineBuffer;\n+ }\n#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_OSX_OS))\nreturn pclose(fp);\n@@ -538,13 +539,15 @@ namespace occa {\n<< \" -o \" << binaryFilename\n<< \" > /dev/null 2>&1\";\n- const int compileError = system(ss.str().c_str());\n+ system(ss.str().c_str());\n+\n+ OCCA_ERROR(\"Could not compile compilerVendorTest.cpp\",\n+ sys::fileExists(binaryFilename));\n- if (!compileError) {\nint exitStatus = system(binaryFilename.c_str());\nint vendorBit = WEXITSTATUS(exitStatus);\n- if (vendorBit < sys::vendor::b_max)\n+ if (vendorBit < sys::vendor::b_max) {\nvendor_ = (1 << vendorBit);\n}\n@@ -609,12 +612,13 @@ namespace occa {\nvoid addSharedBinaryFlagsTo(const int vendor_, std::string &flags) {\nstd::string sFlags = sys::compilerSharedBinaryFlags(vendor_);\n- if (flags.size() == 0)\n+ if (flags.size() == 0) {\nflags = sFlags;\n-\n- if (flags.find(sFlags) == std::string::npos)\n+ }\n+ if (flags.find(sFlags) == std::string::npos) {\nflags = (sFlags + \" \" + flags);\n}\n+ }\n//---[ Dynamic Methods ]------------\nvoid* malloc(udim_t bytes) {\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[sys] Added 2 more signal catches
|
378,349 |
06.04.2017 19:53:49
| 18,000 |
1f0c04ae7e5bf28e15cfe7b5a0e177268c962d95
|
[sys] Added 1 more signal catch
|
[
{
"change_type": "MODIFY",
"old_path": "src/tools/env.cpp",
"new_path": "src/tools/env.cpp",
"diff": "@@ -62,6 +62,7 @@ namespace occa {\n// Signal handling\n::signal(SIGTERM, env::signalExit);\n::signal(SIGINT , env::signalExit);\n+ ::signal(SIGABRT, env::signalExit);\n#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_OSX_OS))\n::signal(SIGKILL, env::signalExit);\n::signal(SIGQUIT, env::signalExit);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[sys] Added 1 more signal catch
|
378,349 |
06.04.2017 19:57:19
| 18,000 |
a2808ac86f568bf1006c9ae58f5aef0a023207f7
|
[Bug] Fixed some ss.str().c_str()
|
[
{
"change_type": "MODIFY",
"old_path": "src/modes/openmp/utils.cpp",
"new_path": "src/modes/openmp/utils.cpp",
"diff": "@@ -87,7 +87,8 @@ namespace occa {\n<< \" -o \" << binaryFilename\n<< \" > /dev/null 2>&1\";\n- const int compileError = system(ss.str().c_str());\n+ const std::string compileLine = ss.str();\n+ const int compileError = system(compileLine.c_str());\nif (compileError) {\nflag = openmp::notSupported;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/sys.cpp",
"new_path": "src/tools/sys.cpp",
"diff": "@@ -539,7 +539,8 @@ namespace occa {\n<< \" -o \" << binaryFilename\n<< \" > /dev/null 2>&1\";\n- system(ss.str().c_str());\n+ const std::string compileLine = ss.str();\n+ system(compileLine.c_str());\nOCCA_ERROR(\"Could not compile compilerVendorTest.cpp\",\nsys::fileExists(binaryFilename));\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Bug] Fixed some ss.str().c_str()
|
378,349 |
07.04.2017 08:20:26
| 18,000 |
19c8c1819156152976a679d3a14aeb501c3c18cb
|
[GC] Building kernels and memory objects increases the device reference count
|
[
{
"change_type": "MODIFY",
"old_path": "examples/addVectors/cpp/main.cpp",
"new_path": "examples/addVectors/cpp/main.cpp",
"diff": "int main(int argc, char **argv) {\nocca::printModeInfo();\n-\nint entries = 5;\nfloat *a = new float[entries];\n@@ -59,9 +58,10 @@ int main(int argc, char **argv) {\nstd::cout << i << \": \" << ab[i] << '\\n';\n}\nfor (int i = 0; i < entries; ++i) {\n- if (ab[i] != (a[i] + b[i]))\n+ if (ab[i] != (a[i] + b[i])) {\nthrow 1;\n}\n+ }\ndelete [] a;\ndelete [] b;\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/device.hpp",
"new_path": "include/occa/device.hpp",
"diff": "@@ -112,6 +112,9 @@ namespace occa {\n//---[ device ]-----------------------\nclass device {\n+ friend class kernel;\n+ friend class memory;\n+\nprivate:\ndevice_v *dHandle;\n@@ -127,6 +130,7 @@ namespace occa {\nprivate:\nvoid setDHandle(device_v *dhandle_);\nvoid removeDHandleRef();\n+ static void removeDHandleRefFrom(device_v *&dhandle_);\npublic:\nvoid dontUseRefs();\n@@ -134,6 +138,7 @@ namespace occa {\nbool operator == (const occa::device &d) const;\nvoid free();\n+ static void free(device_v *&dHandle_);\nbool isInitialized();\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/kernel.hpp",
"new_path": "include/occa/kernel.hpp",
"diff": "@@ -216,6 +216,7 @@ namespace occa {\nprivate:\nvoid setKHandle(kernel_v *kHandle_);\n+ void setDHandle(device_v *dHandle_);\nvoid removeKHandleRef();\npublic:\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/memory.hpp",
"new_path": "include/occa/memory.hpp",
"diff": "@@ -137,6 +137,7 @@ namespace occa {\nprivate:\nvoid setMHandle(memory_v *mHandle_);\n+ void setDHandle(device_v *dHandle_);\nvoid removeMHandleRef();\npublic:\n"
},
{
"change_type": "MODIFY",
"old_path": "src/base.cpp",
"new_path": "src/base.cpp",
"diff": "@@ -40,15 +40,15 @@ namespace occa {\n//---[ Device Functions ]-------------\ndevice host() {\nstatic device _host;\n- if (_host.getDHandle() == NULL) {\n- _host = occa::device(newModeDevice(occa::properties(\"mode: 'Serial'\")));\n+ if (!_host.isInitialized()) {\n+ _host = occa::device(newModeDevice(\"mode: 'Serial'\"));\n}\nreturn _host;\n}\ndevice& currentDevice() {\nstatic device cdev;\n- if (cdev.getDHandle() == NULL) {\n+ if (!cdev.isInitialized()) {\ncdev = host();\n}\nreturn cdev;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/device.cpp",
"new_path": "src/device.cpp",
"diff": "@@ -89,10 +89,14 @@ namespace occa {\n}\nvoid device::removeDHandleRef() {\n- if (dHandle && !dHandle->removeRef()) {\n- free();\n- delete dHandle;\n- dHandle = NULL;\n+ removeDHandleRefFrom(dHandle);\n+ }\n+\n+ void device::removeDHandleRefFrom(device_v *&dHandle_) {\n+ if (dHandle_ && !dHandle_->removeRef()) {\n+ free(dHandle_);\n+ delete dHandle_;\n+ dHandle_ = NULL;\n}\n}\n@@ -107,16 +111,20 @@ namespace occa {\n}\nvoid device::free() {\n- if (dHandle == NULL) {\n+ free(dHandle);\n+ }\n+\n+ void device::free(device_v *&dHandle_) {\n+ if (dHandle_ == NULL) {\nreturn;\n}\n- const int streamCount = dHandle->streams.size();\n+ const int streamCount = dHandle_->streams.size();\nfor (int i = 0; i < streamCount; ++i) {\n- dHandle->freeStream(dHandle->streams[i]);\n+ dHandle_->freeStream(dHandle_->streams[i]);\n}\n- dHandle->streams.clear();\n- dHandle->free();\n+ dHandle_->streams.clear();\n+ dHandle_->free();\n}\nbool device::isInitialized() {\n@@ -236,17 +244,18 @@ namespace occa {\nconst std::string realFilename = io::filename(filename);\nif (!allProps.get(\"OKL\", true)) {\n- return kernel(dHandle->buildKernel(realFilename, kernelName, allProps));\n+ kernel ker(dHandle->buildKernel(realFilename, kernelName, allProps));\n+ ker.setDHandle(dHandle);\n+ return ker;\n}\nhash_t hash = occa::hashFile(realFilename);\nhash ^= props.hash();\nhash ^= occa::hash(mode());\n- occa::properties launcherProps(\"mode: 'Serial'\");\n- kernel ker(newModeKernel(launcherProps));\n+ kernel ker(newModeKernel(host().properties()));\n+ ker.setDHandle(host().dHandle);\nkernel_v *k = ker.kHandle;\n- k->dHandle = newModeDevice(launcherProps);\nconst std::string hashDir = io::hashDir(realFilename, hash);\nconst std::string parsedFile = hashDir + \"parsedSource.occa\";\n@@ -277,6 +286,7 @@ namespace occa {\nss.str(\"\");\nkernel sKer(dHandle->buildKernel(parsedFile, sKerName, allProps));\n+ sKer.setDHandle(dHandle);\nsKer.kHandle->metadata = k->metadata;\nsKer.kHandle->metadata.name = sKerName;\nsKer.kHandle->metadata.nestedKernels = 0;\n@@ -332,7 +342,7 @@ namespace occa {\nconst occa::properties &props) {\nkernel ker(dHandle->buildKernelFromBinary(filename, kernelName, props));\n- ker.kHandle->dHandle = dHandle;\n+ ker.setDHandle(dHandle);\nreturn ker;\n}\n// |=================================\n@@ -341,24 +351,35 @@ namespace occa {\nmemory device::malloc(const dim_t bytes,\nconst void *src,\nconst occa::properties &props) {\n- OCCA_ERROR(\"Trying to allocate negative bytes (\" << bytes << \")\",\n- bytes >= 0);\n+\n+ OCCA_ERROR(\"Trying to allocate \"\n+ << (bytes ? \"negative\" : \"zero\") << \" bytes (\" << bytes << \")\",\n+ bytes > 0);\nmemory mem(dHandle->malloc(bytes, src, props));\n- mem.mHandle->dHandle = dHandle;\n+ mem.setDHandle(dHandle);\ndHandle->bytesAllocated += bytes;\nreturn mem;\n}\n+ memory device::malloc(const dim_t bytes,\n+ const occa::properties &props) {\n+\n+ return malloc(bytes, NULL, props);\n+ }\n+\nvoid* device::umalloc(const dim_t bytes,\nconst void *src,\nconst occa::properties &props) {\n- OCCA_ERROR(\"Trying to allocate negative bytes (\" << bytes << \")\",\n- bytes >= 0);\n+\n+ OCCA_ERROR(\"Trying to allocate \"\n+ << (bytes ? \"negative\" : \"zero\") << \" bytes (\" << bytes << \")\",\n+ bytes > 0);\nmemory mem = malloc(bytes, src, props);\n+ mem.setDHandle(dHandle);\nmem.setupUva();\nmem.dontUseRefs();\n@@ -369,14 +390,21 @@ namespace occa {\nreturn mem.mHandle->uvaPtr;\n}\n+ void* device::umalloc(const dim_t bytes,\n+ const occa::properties &props) {\n+\n+ return umalloc(bytes, NULL, props);\n+ }\n+\nocca::memory device::wrapMemory(void *handle_,\nconst dim_t bytes,\nconst occa::properties &props) {\n+\nOCCA_ERROR(\"Trying to wrap memory with negative bytes (\" << bytes << \")\",\nbytes >= 0);\nmemory mem(dHandle->wrapMemory(handle_, bytes, props));\n- mem.mHandle->dHandle = dHandle;\n+ mem.setDHandle(dHandle);\nmem.dontUseRefs();\ndHandle->bytesAllocated += bytes;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/kernel.cpp",
"new_path": "src/kernel.cpp",
"diff": "@@ -308,9 +308,18 @@ namespace occa {\n}\n}\n+ void kernel::setDHandle(device_v *dHandle) {\n+ kHandle->dHandle = dHandle;\n+ // If this is the very first reference, update the device references\n+ if (kHandle->getRefs() == 1) {\n+ kHandle->dHandle->addRef();\n+ }\n+ }\n+\nvoid kernel::removeKHandleRef() {\nif (kHandle && !kHandle->removeRef()) {\nfree();\n+ device::removeDHandleRefFrom(kHandle->dHandle);\ndelete kHandle;\nkHandle = NULL;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/memory.cpp",
"new_path": "src/memory.cpp",
"diff": "@@ -110,9 +110,18 @@ namespace occa {\n}\n}\n+ void memory::setDHandle(device_v *dHandle) {\n+ mHandle->dHandle = dHandle;\n+ // If this is the very first reference, update the device references\n+ if (mHandle->getRefs() == 1) {\n+ mHandle->dHandle->addRef();\n+ }\n+ }\n+\nvoid memory::removeMHandleRef() {\nif (mHandle && !mHandle->removeRef()) {\nfree();\n+ device::removeDHandleRefFrom(mHandle->dHandle);\ndelete mHandle;\nmHandle = NULL;\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[GC] Building kernels and memory objects increases the device reference count
|
378,349 |
07.04.2017 09:57:31
| 18,000 |
aa094df8418337d19261c6dab455e095327702d2
|
[Device] malloc and umalloc now has a 2-arg method
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/device.hpp",
"new_path": "include/occa/device.hpp",
"diff": "@@ -190,10 +190,16 @@ namespace occa {\nconst void *src = NULL,\nconst occa::properties &props = occa::properties());\n+ occa::memory malloc(const dim_t bytes,\n+ const occa::properties &props);\n+\nvoid* umalloc(const dim_t bytes,\nconst void *src = NULL,\nconst occa::properties &props = occa::properties());\n+ void* umalloc(const dim_t bytes,\n+ const occa::properties &props);\n+\nocca::memory wrapMemory(void *handle_,\nconst dim_t bytes,\nconst occa::properties &props = occa::properties());\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Device] malloc and umalloc now has a 2-arg method
|
378,349 |
08.04.2017 21:45:19
| 18,000 |
dde1844d7331ed29d5f201303a8f44488c89964e
|
[GC] kernelBuilder works with GC, fixed GC with UM
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/array/array.tpp",
"new_path": "include/occa/array/array.tpp",
"diff": "@@ -287,6 +287,7 @@ namespace occa {\nvoid array<TM,idxType>::allocate() {\ndata_ = (TM*) device.umalloc(bytes());\nmemory_ = occa::memory(data_);\n+ memory_.getMHandle()->setRefs(1);\n}\ntemplate <class TM, const int idxType>\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/array/linalg.hpp",
"new_path": "include/occa/array/linalg.hpp",
"diff": "@@ -39,9 +39,9 @@ namespace occa {\nconst int tileSize);\ntemplate <class VTYPE_IN, class VTYPE_OUT>\n- kernelBuilder* makeAssignmentBuilders(const std::string &kernelName);\n+ kernelBuilderVector_t makeAssignmentBuilders(const std::string &kernelName);\n- inline occa::kernel getTiledKernel(kernelBuilder *builders,\n+ inline occa::kernel getTiledKernel(kernelBuilderVector_t &builders,\nocca::device dev,\nconst int tileSize) {\nfor (int i = 0; i < usedTileSizeCount; ++i) {\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/array/linalg.tpp",
"new_path": "include/occa/array/linalg.tpp",
"diff": "@@ -35,11 +35,11 @@ namespace occa {\n}\ntemplate <class VTYPE_IN, class VTYPE_OUT>\n- kernelBuilder* makeAssignmentBuilders(const std::string &kernelName) {\n- kernelBuilder *builders = new kernelBuilder[usedTileSizeCount];\n+ kernelBuilderVector_t makeAssignmentBuilders(const std::string &kernelName) {\n+ kernelBuilderVector_t builders;\nfor (int i = 0; i < usedTileSizeCount; ++i) {\n- builders[i] = makeAssignmentBuilder<VTYPE_IN,VTYPE_OUT>(kernelName,\n- usedTileSizes[i]);\n+ builders.push_back(makeAssignmentBuilder<VTYPE_IN,VTYPE_OUT>(kernelName,\n+ usedTileSizes[i]));\n}\nreturn builders;\n}\n@@ -77,7 +77,7 @@ namespace occa {\nvoid operator_eq(occa::memory vec,\nconst VTYPE_OUT value,\nconst int tileSize) {\n- static kernelBuilder *builders =\n+ static kernelBuilderVector_t builders =\nmakeAssignmentBuilders<VTYPE_OUT,VTYPE_OUT>(\"eq_const\");\nconst int entries = vec.size() / sizeof(VTYPE_OUT);\n@@ -90,7 +90,7 @@ namespace occa {\nvoid operator_plus_eq(occa::memory vec,\nconst VTYPE_OUT value,\nconst int tileSize) {\n- static kernelBuilder *builders =\n+ static kernelBuilderVector_t builders =\nmakeAssignmentBuilders<VTYPE_OUT,VTYPE_OUT>(\"plus_eq_const\");\nconst int entries = vec.size() / sizeof(VTYPE_OUT);\n@@ -103,7 +103,7 @@ namespace occa {\nvoid operator_plus_eq(occa::memory in,\nocca::memory out,\nconst int tileSize) {\n- static kernelBuilder *builders =\n+ static kernelBuilderVector_t builders =\nmakeAssignmentBuilders<VTYPE_IN,VTYPE_OUT>(\"plus_eq\");\nconst int entries = in.size() / sizeof(VTYPE_OUT);\n@@ -116,7 +116,7 @@ namespace occa {\nvoid operator_sub_eq(occa::memory vec,\nconst VTYPE_OUT value,\nconst int tileSize) {\n- static kernelBuilder *builders =\n+ static kernelBuilderVector_t builders =\nmakeAssignmentBuilders<VTYPE_OUT,VTYPE_OUT>(\"sub_eq_const\");\nconst int entries = vec.size() / sizeof(VTYPE_OUT);\n@@ -129,7 +129,7 @@ namespace occa {\nvoid operator_sub_eq(occa::memory in,\nocca::memory out,\nconst int tileSize) {\n- static kernelBuilder *builders =\n+ static kernelBuilderVector_t builders =\nmakeAssignmentBuilders<VTYPE_IN,VTYPE_OUT>(\"sub_eq\");\nconst int entries = in.size() / sizeof(VTYPE_OUT);\n@@ -142,7 +142,7 @@ namespace occa {\nvoid operator_mult_eq(occa::memory vec,\nconst VTYPE_OUT value,\nconst int tileSize) {\n- static kernelBuilder *builders =\n+ static kernelBuilderVector_t builders =\nmakeAssignmentBuilders<VTYPE_OUT,VTYPE_OUT>(\"mult_eq_const\");\nconst int entries = vec.size() / sizeof(VTYPE_OUT);\n@@ -155,7 +155,7 @@ namespace occa {\nvoid operator_mult_eq(occa::memory in,\nocca::memory out,\nconst int tileSize) {\n- static kernelBuilder *builders =\n+ static kernelBuilderVector_t builders =\nmakeAssignmentBuilders<VTYPE_IN,VTYPE_OUT>(\"mult_eq\");\nconst int entries = in.size() / sizeof(VTYPE_OUT);\n@@ -168,7 +168,7 @@ namespace occa {\nvoid operator_div_eq(occa::memory vec,\nconst VTYPE_OUT value,\nconst int tileSize) {\n- static kernelBuilder *builders =\n+ static kernelBuilderVector_t builders =\nmakeAssignmentBuilders<VTYPE_OUT,VTYPE_OUT>(\"div_eq_const\");\nconst int entries = vec.size() / sizeof(VTYPE_OUT);\n@@ -181,7 +181,7 @@ namespace occa {\nvoid operator_div_eq(occa::memory in,\nocca::memory out,\nconst int tileSize) {\n- static kernelBuilder *builders =\n+ static kernelBuilderVector_t builders =\nmakeAssignmentBuilders<VTYPE_IN,VTYPE_OUT>(\"div_eq\");\nconst int entries = in.size() / sizeof(VTYPE_OUT);\n@@ -399,11 +399,10 @@ namespace occa {\nocca::memory y,\nconst int tileSize) {\n- static kernelBuilder *builders;\n- if (!builders) {\n- builders = new kernelBuilder[usedTileSizeCount];\n+ static kernelBuilderVector_t builders;\n+ if (!builders.size()) {\nfor (int i = 0; i < usedTileSizeCount; ++i) {\n- builders[i] =\n+ kernelBuilder kerb =\ncustomLinearMethod(\"axpy\",\n\"v0[i] += c0 * v1[i];\",\n\"defines: {\"\n@@ -412,6 +411,7 @@ namespace occa {\n\" VTYPE1: '\" + primitiveinfo<VTYPE_X>::name + \"',\"\n\" TILESIZE: '\" + toString(usedTileSizes[i]) + \"',\"\n\"}\");\n+ builders.push_back(kerb);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/kernel.hpp",
"new_path": "include/occa/kernel.hpp",
"diff": "@@ -36,6 +36,7 @@ namespace occa {\nclass memory_v; class memory;\nclass device_v; class device;\nclass kernelArg_t;\n+ class kernelBuilder;\ntypedef std::vector<kernelArg_t> kArgVector_t;\ntypedef kArgVector_t::iterator kArgVectorIterator;\n@@ -45,6 +46,10 @@ namespace occa {\ntypedef hashedKernelMap_t::iterator hashedKernelMapIterator;\ntypedef hashedKernelMap_t::const_iterator cHashedKernelMapIterator;\n+ typedef std::vector<kernelBuilder> kernelBuilderVector_t;\n+ typedef kernelBuilderVector_t::iterator kernelBuilderVectorIterator;\n+ typedef kernelBuilderVector_t::const_iterator cKernelBuilderVectorIterator;\n+\n//---[ KernelArg ]--------------------\nnamespace kArgInfo {\nstatic const char none = 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/gc.hpp",
"new_path": "include/occa/tools/gc.hpp",
"diff": "@@ -36,6 +36,8 @@ namespace occa {\nint getRefs() const;\nvoid addRef();\nint removeRef();\n+\n+ void setRefs(const int refs_);\nvoid dontUseRefs();\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/device.cpp",
"new_path": "src/device.cpp",
"diff": "@@ -379,9 +379,8 @@ namespace occa {\nbytes > 0);\nmemory mem = malloc(bytes, src, props);\n- mem.setDHandle(dHandle);\n- mem.setupUva();\nmem.dontUseRefs();\n+ mem.setupUva();\nif (props.get<bool>(\"managed\", true)) {\nmem.startManaging();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/gc.cpp",
"new_path": "src/tools/gc.cpp",
"diff": "@@ -44,6 +44,10 @@ namespace occa {\nreturn refs;\n}\n+ void withRefs::setRefs(const int refs_) {\n+ refs = refs_;\n+ }\n+\nvoid withRefs::dontUseRefs() {\nrefs = -1;\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[GC] kernelBuilder works with GC, fixed GC with UM
|
378,349 |
09.04.2017 15:01:33
| 18,000 |
c57f538f7c425e0c839912f930613b6b0921f33a
|
[UM] Fixed some uva issues
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/uva.hpp",
"new_path": "include/occa/uva.hpp",
"diff": "@@ -76,15 +76,15 @@ namespace occa {\nvoid startManaging(void *ptr);\nvoid stopManaging(void *ptr);\n- void syncToDevice(void *ptr, const udim_t bytes = 0);\n- void syncFromDevice(void *ptr, const udim_t bytes = 0);\n+ void syncToDevice(void *ptr, const udim_t bytes = -1);\n+ void syncFromDevice(void *ptr, const udim_t bytes = -1);\nvoid syncMemToDevice(occa::memory_v *mem,\n- const udim_t bytes = 0,\n+ const udim_t bytes = -1,\nconst udim_t offset = 0);\nvoid syncMemFromDevice(occa::memory_v *mem,\n- const udim_t bytes = 0,\n+ const udim_t bytes = -1,\nconst udim_t offset = 0);\nbool needsSync(void *ptr);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/memory.cpp",
"new_path": "src/memory.cpp",
"diff": "@@ -222,17 +222,21 @@ namespace occa {\nconst dim_t offset) {\nudim_t bytes_ = ((bytes == -1) ? mHandle->size : bytes);\n- OCCA_ERROR(\"Trying to allocate negative bytes (\" << bytes << \")\",\n+ OCCA_ERROR(\"Trying to copy negative bytes (\" << bytes << \")\",\nbytes >= -1);\nOCCA_ERROR(\"Cannot have a negative offset (\" << offset << \")\",\noffset >= 0);\n+ if (bytes_ == 0) {\n+ return;\n+ }\n+\nif (mHandle->dHandle->hasSeparateMemorySpace()) {\nOCCA_ERROR(\"Memory has size [\" << mHandle->size << \"],\"\n<< \" trying to access [ \" << offset << \" , \" << (offset + bytes_) << \" ]\",\n(bytes_ + offset) <= mHandle->size);\n- copyTo(mHandle->uvaPtr, bytes_, offset);\n+ copyFrom(mHandle->uvaPtr, bytes_, offset);\nmHandle->memInfo |= uvaFlag::inDevice;\nmHandle->memInfo &= ~uvaFlag::isStale;\n@@ -245,17 +249,21 @@ namespace occa {\nconst dim_t offset) {\nudim_t bytes_ = ((bytes == 0) ? mHandle->size : bytes);\n- OCCA_ERROR(\"Trying to allocate negative bytes (\" << bytes << \")\",\n+ OCCA_ERROR(\"Trying to copy negative bytes (\" << bytes << \")\",\nbytes >= -1);\nOCCA_ERROR(\"Cannot have a negative offset (\" << offset << \")\",\noffset >= 0);\n+ if (bytes_ == 0) {\n+ return;\n+ }\n+\nif (mHandle->dHandle->hasSeparateMemorySpace()) {\nOCCA_ERROR(\"Memory has size [\" << mHandle->size << \"],\"\n<< \" trying to access [ \" << offset << \" , \" << (offset + bytes_) << \" ]\",\n(bytes_ + offset) <= mHandle->size);\n- copyFrom(mHandle->uvaPtr, bytes_, offset);\n+ copyTo(mHandle->uvaPtr, bytes_, offset);\nmHandle->memInfo &= ~uvaFlag::inDevice;\nmHandle->memInfo &= ~uvaFlag::isStale;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/uva.cpp",
"new_path": "src/uva.cpp",
"diff": "@@ -83,14 +83,11 @@ namespace occa {\nuvaPtrInfo_t& uvaPtrInfo_t::operator = (const uvaPtrInfo_t &upi) {\nmem = upi.mem;\n-\nreturn *this;\n}\nocca::device uvaPtrInfo_t::getDevice() {\n- occa::memory m(mem);\n-\n- return occa::device(m.getDHandle());\n+ return occa::device(mem->dHandle);\n}\nocca::memory uvaPtrInfo_t::getMemory() {\n@@ -99,11 +96,7 @@ namespace occa {\nocca::memory_v* uvaToMemory(void *ptr) {\nptrRangeMap_t::iterator it = uvaMap.find(ptr);\n-\n- if (it == uvaMap.end()) {\n- return NULL;\n- }\n- return it->second;\n+ return (it == uvaMap.end()) ? NULL : it->second;\n}\nvoid startManaging(void *ptr) {\n@@ -139,7 +132,7 @@ namespace occa {\nconst udim_t offset) {\nif (!mem->dHandle->hasSeparateMemorySpace()) {\n- memcpy(occa::memory(mem->handle),\n+ memcpy(occa::memory(mem),\nptrOff(mem->uvaPtr, offset),\nbytes, offset);\n} else {\n@@ -153,7 +146,7 @@ namespace occa {\nif (!mem->dHandle->hasSeparateMemorySpace()) {\nmemcpy(ptrOff(mem->uvaPtr, offset),\n- occa::memory(mem->handle),\n+ occa::memory(mem),\nbytes, offset);\n} else {\nocca::memory(mem).syncFromDevice(bytes, offset);\n@@ -183,28 +176,26 @@ namespace occa {\nvoid removeFromStaleMap(void *ptr) {\nptrRangeMap_t::iterator it = uvaMap.find(ptr);\n-\nif (it == uvaMap.end()) {\nreturn;\n}\n- memory m(it->second);\n+ memory m(it->second);\nif (!m.uvaIsStale()) {\nreturn;\n}\n+\nremoveFromStaleMap(m.getMHandle());\n}\nvoid removeFromStaleMap(memory_v *mem) {\nocca::memory m(mem);\n-\nconst size_t staleEntries = uvaStaleMemory.size();\nfor (size_t i = 0; i < staleEntries; ++i) {\nif (uvaStaleMemory[i] == mem) {\nm.uvaMarkFresh();\nuvaStaleMemory.erase(uvaStaleMemory.begin() + i);\n-\nbreak;\n}\n}\n@@ -215,7 +206,6 @@ namespace occa {\nif ((it != uvaMap.end()) &&\n(((void*) it->first.start) != ((void*) it->second))) {\n-\nocca::memory(it->second).free();\n} else {\n::free(ptr);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[UM] Fixed some uva issues
|
378,349 |
13.05.2017 10:58:03
| 18,000 |
4554c28c6ca17176396173e676d31a4690476a57
|
[README] Updates
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "[](https://travis-ci.org/libocca/occa)\n[](https://coveralls.io/github/libocca/occa?branch=1.0)\n[](https://occa.readthedocs.io/en/latest/?badge=latest)\n-[](https://gitter.im/libocca/occa?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)\nOCCA is an open-source (MIT license) library used to program current multi-core/many-core architectures.\nDevices (such as CPUs, GPUs, Intel's Xeon Phi, FPGAs, etc) are abstracted using an offload-model for application development and programming for the devices is done through a C-based (OKL) kernel.\nOCCA gives developers the ability to target devices at run-time by using run-time compilation for device kernels.\n-## Installing\n-\n-Using a terminal, go to your OCCA directory\n-You should see:\n- README.md (this file)\n- include\n- src\n- lib\n-\n-To compile `libocca.so`, type:\n+### Installing\n```bash\ngit clone https://github.com/libocca/occa.git\n@@ -27,73 +17,71 @@ cd occa\nmake -j 4\n```\n-Python 2 and 3 bindings are also available.\n-If you wish to setup the occa Python module\n+### Environment\n+Setup environment variables inside the `occa` directory\n+\n+#### Linux\n```bash\n-python scripts/make.py\n+export OCCA_DIR=\"${PWD}\"\n+export PATH+=\":${OCCA_DIR}\"\n+export LD_LIBRARY_PATH+=\":${OCCA_DIR}/lib\"\n```\n+#### Mac OSX\n+```bash\n+export OCCA_DIR=\"${PWD}\"\n+export PATH+=\":${OCCA_DIR}\"\n+export DYLD_LIBRARY_PATH+=\":${OCCA_DIR}/lib\"\n+```\n-## Examples\n+### occa Command\n-We have a few examples to show different features of OCCA. The addVectors example contains examples for each current supported language\n+There is an executable `occa` provided inside `${OCCA_DIR}/bin`\n-* C++\n-* C\n-* Python\n+```bash\n+> occa --help\n-### Compile\n-To compile addVectors (Hello World! style example) in C++\n+Usage: occa COMMAND\n-```bash\n-cd examples/addVectors/cpp\n-make\n-```\n+Can be used to display information of cache kernels.\n-### Environment\n-Setup your library path to point to libocca.so\n+Commands:\n+ autocomplete Prints shell functions to autocomplete occa\n+ commands and arguments\n+ cache Cache kernels\n+ clear Clears cached files and cache locks\n+ env Print environment variables used in OCCA\n+ info Prints information about available OCCA modes\n-```bash\n-# Linux\n-export LD_LIBRARY_PATH+=':<occa>/lib'\n-# Mac\n-export DYLD_LIBRARY_PATH+=':<occa>/lib'\n+Arguments:\n+ COMMAND Command to run\n```\n-where `<occa>` is the OCCA directory\n-## Run\n+Autocomplete with\n+\n+#### Linux\n+\n```bash\n-./main\n+. <(occa autocomplete bash)\n```\n-## Status\n-* Linux and OSX are fully supported\n-* Windows is partially supported\n- * Code is up-to-date for windows\n- * Missing compilation project/scripts\n- * Visual Studio project is out of date\n-\n-* OKL Status:\n- * Supports most of C\n+#### Mac OSX\n-## Useful environment variables:\n-| Environment Variable | Description |\n-|----------------------------|-----------------------------------------------------|\n-| OCCA_DIR | Sets directory where OCCA was installed |\n-| OCCA_CACHE_DIR | Sets directory where kernels are cached (Default: ${HOME}/._occa |\n-| OCCA_INCLUDE_PATH | Adds directories to find headers |\n-| OCCA_LIBRARY_PATH | Adds directories to find libraries |\n-| OCCA_CXX | C++ compiler used for libocca.so and run-time compilation |\n-| OCCA_CXXFLAGS | C++ compiler flags used for libocca.so and run-time compilation |\n-\n-### OpenCL\n-| Environment Variable | Description |\n-|----------------------------|-----------------------------------------------------|\n-| OCCA_OPENCL_COMPILER_FLAGS | Adds additional OpenCL flags when compiling kernels |\n+```bash\n+eval \"$(occa autocomplete bash)\"\n+```\n-### CUDA\n+### Useful environment variables:\n| Environment Variable | Description |\n-|----------------------------|-----------------------------------------------------|\n-| OCCA_CUDA_COMPILER | Can be used to specify the CUDA compiler |\n-| OCCA_CUDA_COMPILER_FLAGS | Adds additional OpenCL flags when compiling kernels |\n\\ No newline at end of file\n+|----------------------------|----------------------------------------------------------------------------------|\n+| OCCA_DIR | Directory where OCCA is installed, overwrites occa::OCCA_DIR set at compile-time |\n+| OCCA_CACHE_DIR | Directory where kernels get cached (Default: ${HOME}/.occa) |\n+| OCCA_INCLUDE_PATH | Path to find headers, such as CUDA and OpenCL headers (: delimited) |\n+| OCCA_LIBRARY_PATH | Path to find .so libraries (: delimited) |\n+| OCCA_CXX | C++ compiler used for run-time kernel compilation |\n+| OCCA_CXXFLAGS | C++ compiler flags used for run-time kernel compilation |\n+| OCCA_OPENCL_COMPILER_FLAGS | Additional OpenCL flags when compiling kernels |\n+| OCCA_CUDA_COMPILER | Compiler used for run-time CUDA kernel compilation |\n+| OCCA_CUDA_COMPILER_FLAGS | CUDA compiler flags used for run-time kernel compilation |\n+| OCCA_VERBOSE | Verbose logging if set to true if not: 0/n/no/false (Default: false) |\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[README] Updates
|
378,346 |
11.10.2017 15:40:51
| 18,000 |
87cdcd5eb46948f0b6af97db64cf74807084514c
|
[Make] Updating shelltools for OpenCL on ROCm
* [occa]: updating shelltools script with include and library paths for OpenCL in ROCm.
OCCA now successfully builds with, "make CXX=hcc" on my dual radeon box.
Examples appear to be working correctly.
* [occa]: converting from x86_64 to * for path to OpenCL on ROCm
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/shellTools.sh",
"new_path": "scripts/shellTools.sh",
"diff": "@@ -101,6 +101,7 @@ function defaultIncludePath {\nmergedPaths+=\":$CPLUS_INCLUDE_PATH\"\nmergedPaths+=\":$C_INCLUDE_PATH\"\nmergedPaths+=\":$INCLUDEPATH\"\n+ mergedPaths+=\":/opt/rocm/opencl/include\"\nmergedPaths+=\":/usr/local/cuda*/include\"\nmergedPaths+=\":/Developer/NVIDIA/CUDA*/include\"\nmergedPaths+=\":/usr/local/cuda*/targets/*/include/\"\n@@ -115,6 +116,7 @@ function defaultLibraryPath {\nmergedPaths+=\":$OCCA_LIBRARY_PATH\"\nmergedPaths+=\":$LD_LIBRARY_PATH\"\nmergedPaths+=\":$DYLD_LIBRARY_PATH\"\n+ mergedPaths+=\":/opt/rocm/opencl/lib/*\"\nmergedPaths+=\":/usr/local/cuda*/lib*\"\nmergedPaths+=\":/usr/local/cuda*/lib*/stubs\"\nmergedPaths+=\":/lib:/usr/lib:/usr/lib32:/usr/lib64:\"\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Make] Updating shelltools for OpenCL on ROCm (#68)
* [occa]: updating shelltools script with include and library paths for OpenCL in ROCm.
OCCA now successfully builds with, "make CXX=hcc" on my dual radeon box.
Examples appear to be working correctly.
* [occa]: converting from x86_64 to * for path to OpenCL on ROCm
|
378,364 |
01.12.2017 23:17:11
| 18,000 |
10aa40b86c67f83f3ef59e1f461f3bc31181aac9
|
[Make] Add /opt/cuda to include/lib search path
The cuda libraries, tools, and libraries are installed to /opt/cuda on
Arch linux (and perhaps other linux distributions). Add these to the
search path.
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/shellTools.sh",
"new_path": "scripts/shellTools.sh",
"diff": "@@ -106,6 +106,7 @@ function defaultIncludePath {\nmergedPaths+=\":/Developer/NVIDIA/CUDA*/include\"\nmergedPaths+=\":/usr/local/cuda*/targets/*/include/\"\nmergedPaths+=\":/usr/include\"\n+ mergedPaths+=\":/opt/cuda*/include/\"\necho \"${mergedPaths}\"\n}\n@@ -121,6 +122,7 @@ function defaultLibraryPath {\nmergedPaths+=\":/usr/local/cuda*/lib*/stubs\"\nmergedPaths+=\":/lib:/usr/lib:/usr/lib32:/usr/lib64:\"\nmergedPaths+=\":/usr/lib/*-gnu/\"\n+ mergedPaths+=\":/opt/cuda*/lib*\"\necho \"${mergedPaths}\"\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Make] Add /opt/cuda to include/lib search path (#75)
The cuda libraries, tools, and libraries are installed to /opt/cuda on
Arch linux (and perhaps other linux distributions). Add these to the
search path.
|
378,349 |
22.02.2018 03:27:09
| 21,600 |
a098a811e635b89c7ef678f89520e3785be045e0
|
[README] Autocomplete doc update
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -69,18 +69,12 @@ Arguments:\nCOMMAND Command to run\n```\n-#### Linux Autocomplete\n+#### Bash Autocomplete\n```bash\n. <(occa autocomplete bash)\n```\n-#### Mac OSX Autocomplete\n-\n-```bash\n-eval \"$(occa autocomplete bash)\"\n-```\n-\n### Useful environment variables:\n| Environment Variable | Description |\n|----------------------------|-------------------------------------------------------------------------------------|\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[README] Autocomplete doc update
|
378,349 |
29.04.2018 22:56:46
| 18,000 |
d9d9ebeb6f351f25600d82d73d220dc22bf861d3
|
[README] Fixed links
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "In a nutshell, OCCA (like *oca*-rina) is an open-source library which aims to\n- Make it easy to program different types of devices (e.g. _CPU_, _GPU_, _FPGA_)\n-- Provide a [unified API](/guide/occa/introduction) for interacting with backend device APIs (e.g. _OpenMP_, _CUDA_, _OpenCL_)\n+- Provide a [unified API](http://libocca.org/#/guide/occa/introduction) for interacting with backend device APIs (e.g. _OpenMP_, _CUDA_, _OpenCL_)\n- Use just-in-time compilation to build backend kernels\n-- Provide a [kernel language](/guide/okl/introduction), a minor extension to C, to abstract programming for each backend\n+- Provide a [kernel language](http://libocca.org/#/guide/okl/introduction), a minor extension to C, to abstract programming for each backend\n \n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[README] Fixed links
|
378,349 |
05.05.2018 10:23:40
| 18,000 |
75d17cee8a70086c2c74f31531f3c4228edc41f0
|
[Github] Added pull request template
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/pull_request_template.md",
"diff": "+<!-- Thank you for contributing!! :) -->\n+\n+### Description\n+\n+Description for the pull request\n+\n+### Checks\n+- [ ] Nothing got committed into `./lib` and `./obj`\n+- [ ] MIT License copyright in new files\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Github] Added pull request template
|
378,360 |
06.07.2018 22:29:28
| 18,000 |
a7c578c7ab27469a02c81f353e6804725ac59f6e
|
[CLI,#155] Added -v/--verbose flag
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/occa.cpp",
"new_path": "scripts/occa.cpp",
"diff": "@@ -249,7 +249,14 @@ bool runTranslate(const cli::command &command,\n::exit(1);\n}\n- properties kernelProps = getOptionProperties(options, \"kernel-props\");\n+ bool isVerbose = ( options.find(\"verbose\") != options.end() );\n+\n+ properties kernelProps;\n+\n+ jsonObject translateInfo;\n+\n+ if (isVerbose) {\n+ kernelProps = getOptionProperties(options, \"kernel-props\");\n// Add include-paths\nkernelProps[\"include-paths\"] = (\n@@ -261,6 +268,24 @@ bool runTranslate(const cli::command &command,\ngetOptionDefines(options, \"define\")\n);\n+ // Absolute full path\n+ char* oklFilePath = realpath(filename.c_str(), NULL);\n+ translateInfo[\"Filepath\"] = oklFilePath;\n+ if (oklFilePath)\n+ ::free(oklFilePath);\n+\n+ // Timestamp (GMT)\n+ time_t tsecs = time(0);\n+ std::string timeStr = asctime(gmtime(&tsecs));\n+ timeStr.resize(timeStr.length()-1); // clip trailing '\\n'; timeStr.pop_back() in C++11\n+ timeStr += \" GMT\";\n+ translateInfo[\"Timestamp\"] = timeStr;\n+\n+ // Version\n+ translateInfo[\"OCCA Version\"] = OCCA_VERSION_STR;\n+ translateInfo[\"OKL Version\"] = OKL_VERSION_STR;\n+ }\n+\nlang::parser_t *parser = NULL;\nif (mode == \"Serial\") {\nparser = new lang::okl::serialParser(kernelProps);\n@@ -281,11 +306,17 @@ bool runTranslate(const cli::command &command,\nbool success = parser->succeeded();\nif (success) {\n+ if (isVerbose) {\nstd::cout\n- << \"/* Kernel Props:\\n\"\n+ << \"/* Kernel Props:\" << std::endl\n<< kernelProps\n- << \"*/\\n\"\n- << parser->toString();\n+ << \"*/\" << std::endl;\n+ std::cout\n+ << \"/* Translate Info:\" << std::endl\n+ << translateInfo\n+ << \"*/\" << std::endl;\n+ }\n+ std::cout << parser->toString();\n}\ndelete parser;\nreturn success;\n@@ -453,6 +484,8 @@ int main(const int argc, const char **argv) {\n\"Add additional define\")\n.reusable()\n.withArgs(1))\n+ .addOption(cli::option('v',\"verbose\",\n+ \"Verbose output\"))\n.addArgument(\"FILE\",\n\"An .okl file\",\ntrue);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[CLI,#155] Added -v/--verbose flag (#156)
|
378,355 |
20.07.2018 19:17:57
| 18,000 |
86efdafe419a7d2312f6b1d50bcdd845320416c6
|
[Parser] Fixed an issue where register variables initialized to values in shared were being migrated in OpenCL mode
|
[
{
"change_type": "MODIFY",
"old_path": "src/lang/modes/opencl.cpp",
"new_path": "src/lang/modes/opencl.cpp",
"diff": "@@ -242,8 +242,13 @@ namespace occa {\nstatementExprMap::iterator it = exprMap.begin();\nwhile (it != exprMap.end()) {\ndeclarationStatement &declSmnt = *((declarationStatement*) it->first);\n+\n+ variable_t *var = declSmnt.declarations[0].variable;\n+\n+ if (var->hasAttribute(\"shared\")) {\ndeclSmnt.removeFromParent();\nkernelSmnt.addFirst(declSmnt);\n+ }\n++it;\n}\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Parser] Fixed an issue where register variables initialized to values in shared were being migrated in OpenCL mode (#167)
|
378,355 |
19.07.2018 13:58:58
| 18,000 |
7e555a62b5c67865eeb1676797521da10c850cab
|
[HIP] Fixed a subtle bug regarding how HIP expects kernel arguments to be byte-align and packed.
|
[
{
"change_type": "MODIFY",
"old_path": "src/mode/hip/kernel.cpp",
"new_path": "src/mode/hip/kernel.cpp",
"diff": "@@ -92,6 +92,7 @@ namespace occa {\nconst int kArgCount = (int) arguments.size();\nint argc = 0;\n+ int rem = 0;\nfor (int i = 0; i < kArgCount; ++i) {\nconst kArgVector &iArgs = arguments[i].args;\nconst int argCount = (int) iArgs.size();\n@@ -99,7 +100,18 @@ namespace occa {\ncontinue;\n}\nfor (int ai = 0; ai < argCount; ++ai) {\n- memcpy(vArgs.data() + argc++,&(iArgs[ai].data.int64_), sizeof(void*));\n+ size_t Nbytes;\n+ if (rem+iArgs[ai].size<=sizeof(void*)) {\n+ Nbytes = iArgs[ai].size;\n+ rem = sizeof(void*) - rem - iArgs[ai].size;\n+ } else {\n+ Nbytes = sizeof(void*);\n+ argc+=rem;\n+ rem = 0;\n+ }\n+\n+ memcpy((char*) vArgs.data() + argc,&(iArgs[ai].data.int64_), Nbytes);\n+ argc += Nbytes;\n}\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[HIP] Fixed a subtle bug regarding how HIP expects kernel arguments to be byte-align and packed.
|
378,355 |
19.07.2018 17:22:41
| 18,000 |
5e8e5ace3cc749b971194479310d1b26b43a20df
|
[HIP] Adding target architecture compiler flag to hipcc command
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/mode/hip/device.hpp",
"new_path": "include/occa/mode/hip/device.hpp",
"diff": "@@ -81,6 +81,8 @@ namespace occa {\nconst hash_t kernelHash,\nconst occa::properties &props);\n+ void setArchCompilerFlags(occa::properties &kernelProps);\n+\nvoid compileKernel(const std::string &hashDir,\nconst std::string &kernelName,\nocca::properties &kernelProps,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/mode/hip/device.cpp",
"new_path": "src/mode/hip/device.cpp",
"diff": "@@ -41,6 +41,7 @@ namespace occa {\ndevice::device(const occa::properties &properties_) :\nocca::modeDevice_t(properties_) {\n+ hipDeviceProp_t props;\nif (!properties.has(\"wrapped\")) {\nOCCA_ERROR(\"[HIP] device not given a [device_id] integer\",\nproperties.has(\"device_id\") &&\n@@ -53,6 +54,9 @@ namespace occa {\nOCCA_HIP_ERROR(\"Device: Creating Context\",\nhipCtxCreate(&hipContext, 0, hipDevice));\n+\n+ OCCA_HIP_ERROR(\"Getting device properties\",\n+ hipGetDeviceProperties(&props, deviceID));\n}\np2pEnabled = false;\n@@ -82,6 +86,7 @@ namespace occa {\narchMajorVersion = properties.get(\"hip/arch/major\", archMajorVersion);\narchMinorVersion = properties.get(\"hip/arch/minor\", archMinorVersion);\n+ properties[\"kernel/target\"] = toString(props.gcnArch);\nproperties[\"kernel/verbose\"] = properties.get(\"verbose\", false);\n}\n@@ -339,6 +344,17 @@ namespace occa {\nlock);\n}\n+ void device::setArchCompilerFlags(occa::properties &kernelProps) {\n+ if (kernelProps.get<std::string>(\"compiler_flags\").find(\"-t gfx\") == std::string::npos) {\n+ std::stringstream ss;\n+ std::string arch = kernelProps[\"target\"];\n+ if (arch.size()) {\n+ ss << \" -t gfx\" << arch << ' ';\n+ kernelProps[\"compiler_flags\"] += ss.str();\n+ }\n+ }\n+ }\n+\nvoid device::compileKernel(const std::string &hashDir,\nconst std::string &kernelName,\nocca::properties &kernelProps,\n@@ -350,6 +366,8 @@ namespace occa {\nstd::string binaryFilename = hashDir + kc::binaryFile;\nconst std::string ptxBinaryFilename = hashDir + \"ptx_binary.o\";\n+ setArchCompilerFlags(kernelProps);\n+\nstd::stringstream command;\n//---[ Compiling Command ]--------\n@@ -358,7 +376,7 @@ namespace occa {\n<< \" --genco \"\n<< \" \" << sourceFilename\n<< \" -o \" << binaryFilename\n- << ' ' << kernelProps[\"compilerFlags\"]\n+ << ' ' << kernelProps[\"compiler_flags\"]\n#if (OCCA_OS == OCCA_WINDOWS_OS)\n<< \" -D OCCA_OS=OCCA_WINDOWS_OS -D _MSC_VER=1800\"\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "src/mode/hip/registration.cpp",
"new_path": "src/mode/hip/registration.cpp",
"diff": "@@ -52,6 +52,7 @@ namespace occa {\nsection\n.add(\"Device ID\" , toString(i))\n+ .add(\"Arch\" , \"gfx\"+toString(props.gcnArch))\n.add(\"Device Name\", deviceName)\n.add(\"Memory\" , bytesStr)\n.addDivider();\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[HIP] Adding target architecture compiler flag to hipcc command
|
378,355 |
20.07.2018 09:41:23
| 18,000 |
31e3f6b07259ba536afc7b6635b387c44e59dabb
|
[GPU] Forwarding getMappedPtr changes to HIP
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/mode/hip/memory.hpp",
"new_path": "include/occa/mode/hip/memory.hpp",
"diff": "@@ -41,6 +41,8 @@ namespace occa {\nconst udim_t bytes,\nconst occa::properties &props);\n+ friend void* getMappedPtr(occa::memory mem);\n+\npublic:\nhipDeviceptr_t hipPtr;\nchar *mappedPtr;\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/mode/hip/utils.hpp",
"new_path": "include/occa/mode/hip/utils.hpp",
"diff": "@@ -96,6 +96,8 @@ namespace occa {\nhipCtx_t getContext(occa::device device);\n+ void* getMappedPtr(occa::memory mem);\n+\nocca::device wrapDevice(hipDevice_t device,\nhipCtx_t context,\nconst occa::properties &props = occa::properties());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/mode/hip/utils.cpp",
"new_path": "src/mode/hip/utils.cpp",
"diff": "@@ -177,6 +177,11 @@ namespace occa {\nreturn ((hip::device*) device.getModeDevice())->hipContext;\n}\n+ void* getMappedPtr(occa::memory mem) {\n+ hip::memory *handle = (hip::memory*) mem.getMHandle();\n+ return handle ? handle->mappedPtr : NULL;\n+ }\n+\nocca::device wrapDevice(hipDevice_t device,\nhipCtx_t context,\nconst occa::properties &props) {\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[GPU] Forwarding getMappedPtr changes to HIP
|
378,355 |
14.08.2018 15:47:22
| 18,000 |
89cb85fad081a90d1256961ba14010df2d19a5d2
|
[HIP] Some styling clean-up
|
[
{
"change_type": "MODIFY",
"old_path": "src/mode/hip/kernel.cpp",
"new_path": "src/mode/hip/kernel.cpp",
"diff": "@@ -100,18 +100,20 @@ namespace occa {\ncontinue;\n}\nfor (int ai = 0; ai < argCount; ++ai) {\n- size_t Nbytes;\n+ size_t bytes;\nif (rem+iArgs[ai].size <= sizeof(void*)) {\n- Nbytes = iArgs[ai].size;\n+ bytes = iArgs[ai].size;\nrem = sizeof(void*) - rem - iArgs[ai].size;\n} else {\n- Nbytes = sizeof(void*);\n+ bytes = sizeof(void*);\nargc += rem;\nrem = 0;\n}\n- memcpy((char*) vArgs.data() + argc,&(iArgs[ai].data.int64_), Nbytes);\n- argc += Nbytes;\n+ memcpy((char*) vArgs.data() + argc,\n+ &(iArgs[ai].data.int64_),\n+ bytes);\n+ argc += bytes;\n}\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[HIP] Some styling clean-up
|
378,349 |
17.02.2019 13:59:08
| 21,600 |
707f86936fe88bb79459f9e8c4a782a419d369d9
|
[License] Updated 2018 -> 2019
|
[
{
"change_type": "MODIFY",
"old_path": "LICENSE",
"new_path": "LICENSE",
"diff": "The MIT License (MIT)\n-Copyright (c) 2014-2018 David Medina and Tim Warburton\n+Copyright (c) 2014-2019 David Medina and Tim Warburton\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[License] Updated 2018 -> 2019
|
378,355 |
13.05.2019 17:09:42
| 18,000 |
92164d6960eac6573e317021b17941cb9b5d54ec
|
[HIP/OpenCL] Updates for HIP backend and updating deprecated OpenCL APIs
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/hip/device.hpp",
"new_path": "include/occa/modes/hip/device.hpp",
"diff": "# ifndef OCCA_MODES_HIP_DEVICE_HEADER\n# define OCCA_MODES_HIP_DEVICE_HEADER\n-#include <occa/core/device.hpp>\n+#include <occa/core/launchedDevice.hpp>\n#include <hip/hip_runtime_api.h>\n@@ -12,7 +12,7 @@ namespace occa {\nnamespace hip {\nclass kernel;\n- class device : public occa::modeDevice_t {\n+ class device : public occa::launchedModeDevice_t {\nfriend class kernel;\nprivate:\n@@ -23,7 +23,7 @@ namespace occa {\nbool p2pEnabled;\nhipDevice_t hipDevice;\n- hipCtx_t hipContext;\n+ int deviceID;\ndevice(const occa::properties &properties_);\nvirtual ~device();\n@@ -41,10 +41,12 @@ namespace occa {\n//---[ Stream ]-------------------\nvirtual modeStream_t* createStream(const occa::properties &props);\n- virtual streamTag tagStream() const;\n- virtual void waitFor(streamTag tag) const;\n+ virtual streamTag tagStream();\n+ virtual void waitFor(streamTag tag);\nvirtual double timeBetween(const streamTag &startTag,\n- const streamTag &endTag) const;\n+ const streamTag &endTag);\n+\n+ hipStream_t& getHipStream() const;\n//================================\n//---[ Kernel ]-------------------\n@@ -63,7 +65,7 @@ namespace occa {\nvoid compileKernel(const std::string &hashDir,\nconst std::string &kernelName,\n- occa::properties &kernelProps,\n+ const occa::properties &kernelProps,\nio::lock_t &lock);\nmodeKernel_t* buildOKLKernelFromBinary(const hash_t kernelHash,\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/hip/kernel.hpp",
"new_path": "include/occa/modes/hip/kernel.hpp",
"diff": "#include <hip/hip_runtime_api.h>\n-#include <occa/core/kernel.hpp>\n+#include <occa/core/launchedKernel.hpp>\nnamespace occa {\nnamespace hip {\nclass device;\n- class kernel : public occa::modeKernel_t {\n+ class kernel : public occa::launchedModeKernel_t {\nfriend class device;\nprivate:\nhipModule_t hipModule;\nhipFunction_t hipFunction;\n- occa::modeKernel_t *launcherKernel;\n- std::vector<kernel*> hipKernels;\nmutable std::vector<void*> vArgs;\npublic:\n@@ -38,6 +36,8 @@ namespace occa {\n~kernel();\n+ hipStream_t& getHipStream() const;\n+\nint maxDims() const;\ndim maxOuterDims() const;\ndim maxInnerDims() const;\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/hip/memory.hpp",
"new_path": "include/occa/modes/hip/memory.hpp",
"diff": "@@ -14,6 +14,7 @@ namespace occa {\nclass memory : public occa::modeMemory_t {\nfriend class hip::device;\n+\nfriend occa::memory wrapMemory(occa::device device,\nvoid *ptr,\nconst udim_t bytes,\n@@ -30,6 +31,8 @@ namespace occa {\nconst occa::properties &properties_ = occa::properties());\n~memory();\n+ hipStream_t& getHipStream() const;\n+\nkernelArg makeKernelArg() const;\nmodeMemory_t* addOffset(const dim_t offset);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "include/occa/modes/hip/stream.hpp",
"diff": "+#include <occa/defines.hpp>\n+\n+#if OCCA_HIP_ENABLED\n+# ifndef OCCA_MODES_HIP_STREAM_HEADER\n+# define OCCA_MODES_HIP_STREAM_HEADER\n+\n+#include <hip/hip_runtime.h>\n+\n+#include <occa/core/stream.hpp>\n+\n+namespace occa {\n+ namespace hip {\n+ class stream : public occa::modeStream_t {\n+ public:\n+ hipStream_t hipStream;\n+\n+ stream(modeDevice_t *modeDevice_,\n+ const occa::properties &properties_,\n+ hipStream_t hipStream_);\n+\n+ virtual ~stream();\n+ };\n+ }\n+}\n+\n+# endif\n+#endif\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "include/occa/modes/hip/streamTag.hpp",
"diff": "+#include <occa/defines.hpp>\n+\n+#if OCCA_HIP_ENABLED\n+# ifndef OCCA_MODES_HIP_STREAMTAG_HEADER\n+# define OCCA_MODES_HIP_STREAMTAG_HEADER\n+\n+#include <hip/hip_runtime.h>\n+\n+#include <occa/core/streamTag.hpp>\n+\n+namespace occa {\n+ namespace hip {\n+ class streamTag : public occa::modeStreamTag_t {\n+ public:\n+ hipEvent_t hipEvent;\n+\n+ streamTag(modeDevice_t *modeDevice_,\n+ hipEvent_t hipEvent_);\n+\n+ virtual ~streamTag();\n+ };\n+ }\n+}\n+\n+# endif\n+#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/hip/utils.hpp",
"new_path": "include/occa/modes/hip/utils.hpp",
"diff": "@@ -72,12 +72,7 @@ namespace occa {\nconst dim_t bytes,\nocca::device device);\n- hipCtx_t getContext(occa::device device);\n-\n- void* getMappedPtr(occa::memory mem);\n-\nocca::device wrapDevice(hipDevice_t device,\n- hipCtx_t context,\nconst occa::properties &props = occa::properties());\nocca::memory wrapMemory(occa::device device,\n@@ -85,9 +80,6 @@ namespace occa {\nconst udim_t bytes,\nconst occa::properties &props = occa::properties());\n- hipEvent_t& event(streamTag &tag);\n- const hipEvent_t& event(const streamTag &tag);\n-\nvoid warn(hipError_t errorCode,\nconst std::string &filename,\nconst std::string &function,\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/Makefile",
"new_path": "scripts/Makefile",
"diff": "@@ -304,6 +304,7 @@ ifdef OCCA_HIP_ENABLED\nifeq ($(usingLinux),1)\nlinkerFlags += -lhip_hcc\nendif\n+ compilerFlags += -std=c++11\nendif\nelse\nhipIncFlags = $(call includeFlagsFor,hip/hip_runtime_api.h)\n@@ -324,6 +325,7 @@ else\npaths += $(hipconfig)\npaths += $(hipIncFlags)\nlinkerFlags += $(hipLibFlags)\n+ compilerFlags += -std=c++11\nendif\nendif\nendif\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/hip/device.cpp",
"new_path": "src/modes/hip/device.cpp",
"diff": "#include <occa/modes/hip/device.hpp>\n#include <occa/modes/hip/kernel.hpp>\n#include <occa/modes/hip/memory.hpp>\n+#include <occa/modes/hip/stream.hpp>\n+#include <occa/modes/hip/streamTag.hpp>\n#include <occa/modes/hip/utils.hpp>\n#include <occa/modes/serial/device.hpp>\n#include <occa/modes/serial/kernel.hpp>\n@@ -28,13 +30,13 @@ namespace occa {\nproperties.has(\"device_id\") &&\nproperties[\"device_id\"].isNumber());\n- const int deviceID = properties.get<int>(\"device_id\");\n+ deviceID = properties.get<int>(\"device_id\");\nOCCA_HIP_ERROR(\"Device: Creating Device\",\nhipDeviceGet(&hipDevice, deviceID));\n- OCCA_HIP_ERROR(\"Device: Creating Context\",\n- hipCtxCreate(&hipContext, 0, hipDevice));\n+ OCCA_HIP_ERROR(\"Device: Setting Device\",\n+ hipSetDevice(deviceID));\nOCCA_HIP_ERROR(\"Getting device properties\",\nhipGetDeviceProperties(&props, deviceID));\n@@ -42,19 +44,20 @@ namespace occa {\np2pEnabled = false;\n- std::string compiler = properties[\"kernel/compiler\"];\n- std::string compilerFlags = properties[\"kernel/compilerFlags\"];\n+ std::string compiler, compilerFlags;\n- if (!compiler.size()) {\n- if (env::var(\"OCCA_HIP_COMPILER\").size()) {\n+ if (properties.get<std::string>(\"kernel/compiler\").size()) {\n+ compiler = (std::string) properties[\"kernel/compiler\"];\n+ } else if (env::var(\"OCCA_HIP_COMPILER\").size()) {\ncompiler = env::var(\"OCCA_HIP_COMPILER\");\n} else {\ncompiler = \"hipcc\";\n}\n- }\n- if (!compilerFlags.size()) {\n- compilerFlags = env::var(\"OCCA_HIP_COMPILER_FLAGS\");\n+ if (properties.get<std::string>(\"kernel/compiler_flags\").size()) {\n+ compilerFlags = (std::string) properties[\"kernel/compiler_flags\"];\n+ } else {\n+ compilerFlags = \"-O3\";\n}\nproperties[\"kernel/compiler\"] = compiler;\n@@ -71,18 +74,11 @@ namespace occa {\nproperties[\"kernel/target\"] = toString(props.gcnArch);\n}\n- device::~device() {\n- if (hipContext) {\n- OCCA_HIP_ERROR(\"Device: Freeing Context\",\n- hipCtxDestroy(hipContext) );\n- hipContext = NULL;\n- }\n- }\n+ device::~device() { }\nvoid device::finish() const {\nOCCA_HIP_ERROR(\"Device: Finish\",\n- hipStreamSynchronize(*((hipStream_t*) currentStream)) );\n- hipDeviceSynchronize();\n+ hipStreamSynchronize(getHipStream()));\n}\nbool device::hasSeparateMemorySpace() const {\n@@ -112,52 +108,62 @@ namespace occa {\n}\n//---[ Stream ]---------------------\n- stream_t device::createStream(const occa::properties &props) {\n- hipStream_t *retStream = new hipStream_t;\n+ modeStream_t* device::createStream(const occa::properties &props) {\n+ hipStream_t hipStream;\n- OCCA_HIP_ERROR(\"Device: Setting Context\",\n- hipCtxSetCurrent(hipContext));\n+ OCCA_HIP_ERROR(\"Device: Setting Device\",\n+ hipSetDevice(deviceID));\nOCCA_HIP_ERROR(\"Device: createStream\",\n- hipStreamCreate(retStream));\n+ hipStreamCreate(&hipStream));\n- return retStream;\n+ return new stream(this, props, hipStream);\n}\n- void device::freeStream(stream_t s) const {\n- OCCA_HIP_ERROR(\"Device: freeStream\",\n- hipStreamDestroy( *((hipStream_t*) s) ));\n- delete (hipStream_t*) s;\n- }\n-\n- streamTag device::tagStream() const {\n- streamTag ret;\n+ occa::streamTag device::tagStream() {\n+ hipEvent_t hipEvent;\n- OCCA_HIP_ERROR(\"Device: Setting Context\",\n- hipCtxSetCurrent(hipContext));\n+ OCCA_HIP_ERROR(\"Device: Setting Device\",\n+ hipSetDevice(deviceID));\nOCCA_HIP_ERROR(\"Device: Tagging Stream (Creating Tag)\",\n- hipEventCreate(&hip::event(ret)));\n+ hipEventCreate(&hipEvent));\nOCCA_HIP_ERROR(\"Device: Tagging Stream\",\n- hipEventRecord(hip::event(ret), 0));\n+ hipEventRecord(hipEvent, getHipStream()));\n- return ret;\n+ return new occa::hip::streamTag(this, hipEvent);\n}\n- void device::waitFor(streamTag tag) const {\n+ void device::waitFor(occa::streamTag tag) {\n+ occa::hip::streamTag *hipTag = (\n+ dynamic_cast<occa::hip::streamTag*>(tag.getModeStreamTag())\n+ );\nOCCA_HIP_ERROR(\"Device: Waiting For Tag\",\n- hipEventSynchronize(hip::event(tag)));\n+ hipEventSynchronize(hipTag->hipEvent));\n}\n- double device::timeBetween(const streamTag &startTag,\n- const streamTag &endTag) const {\n- OCCA_HIP_ERROR(\"Device: Waiting for endTag\",\n- hipEventSynchronize(hip::event(endTag)));\n+ double device::timeBetween(const occa::streamTag &startTag,\n+ const occa::streamTag &endTag) {\n+ occa::hip::streamTag *hipStartTag = (\n+ dynamic_cast<occa::hip::streamTag*>(startTag.getModeStreamTag())\n+ );\n+ occa::hip::streamTag *hipEndTag = (\n+ dynamic_cast<occa::hip::streamTag*>(endTag.getModeStreamTag())\n+ );\n+\n+ waitFor(endTag);\nfloat msTimeTaken;\nOCCA_HIP_ERROR(\"Device: Timing Between Tags\",\n- hipEventElapsedTime(&msTimeTaken, hip::event(startTag), hip::event(endTag)));\n+ hipEventElapsedTime(&msTimeTaken,\n+ hipStartTag->hipEvent,\n+ hipEndTag->hipEvent));\nreturn (double) (1.0e-3 * (double) msTimeTaken);\n}\n+\n+ hipStream_t& device::getHipStream() const {\n+ occa::hip::stream *stream = (occa::hip::stream*) currentStream.getModeStream();\n+ return stream->hipStream;\n+ }\n//==================================\n//---[ Kernel ]---------------------\n@@ -229,30 +235,33 @@ namespace occa {\nvoid device::compileKernel(const std::string &hashDir,\nconst std::string &kernelName,\n- occa::properties &kernelProps,\n+ const occa::properties &kernelProps,\nio::lock_t &lock) {\n- const bool verbose = kernelProps.get(\"verbose\", false);\n+ occa::properties allProps = kernelProps;\n+ const bool verbose = allProps.get(\"verbose\", false);\nstd::string sourceFilename = hashDir + kc::sourceFile;\nstd::string binaryFilename = hashDir + kc::binaryFile;\n- const std::string ptxBinaryFilename = hashDir + \"ptx_binary.o\";\n- setArchCompilerFlags(kernelProps);\n+ setArchCompilerFlags(allProps);\nstd::stringstream command;\n+ if (allProps.has(\"compiler_env_script\")) {\n+ command << allProps[\"compiler_env_script\"] << \" && \";\n+ }\n//---[ Compiling Command ]--------\n- command.str(\"\");\n- command << kernelProps[\"compiler\"]\n+ command << allProps[\"compiler\"]\n<< \" --genco \"\n+ << ' ' << allProps[\"compiler_flags\"]\n+// #if (OCCA_OS == OCCA_WINDOWS_OS)\n+// << \" -D OCCA_OS=OCCA_WINDOWS_OS -D _MSC_VER=1800\"\n+// #endif\n+ // << \" -I\" << env::OCCA_DIR << \"include\"\n+ // << \" -L\" << env::OCCA_DIR << \"lib -locca\"\n<< \" \" << sourceFilename\n- << \" -o \" << binaryFilename\n- << ' ' << kernelProps[\"compiler_flags\"]\n-#if (OCCA_OS == OCCA_WINDOWS_OS)\n- << \" -D OCCA_OS=OCCA_WINDOWS_OS -D _MSC_VER=1800\"\n-#endif\n- ;\n+ << \" -o \" << binaryFilename;\nif (!verbose) {\ncommand << \" > /dev/null 2>&1\";\n@@ -299,11 +308,12 @@ namespace occa {\nsourceFilename,\nkernelProps));\n- k.launcherKernel = buildLauncherKernel(hashDir,\n+ k.launcherKernel = buildLauncherKernel(kernelHash,\n+ hashDir,\nkernelName,\nlauncherMetadata[kernelName]);\n- // Find clKernels\n+ // Find hip kernels\ntypedef std::map<int, lang::kernelMetadata> kernelOrderMap;\nkernelOrderMap hipKernelMetadata;\n@@ -349,6 +359,7 @@ namespace occa {\nhipFunction,\nkernelProps);\nhipKernel->dontUseRefs();\n+ hipKernel->metadata = metadata;\nk.deviceKernels.push_back(hipKernel);\n++oit;\n@@ -390,8 +401,8 @@ namespace occa {\nhip::memory &mem = *(new hip::memory(this, bytes, props));\n- OCCA_HIP_ERROR(\"Device: Setting Context\",\n- hipCtxSetCurrent(hipContext));\n+ OCCA_HIP_ERROR(\"Device: Setting Device\",\n+ hipSetDevice(deviceID));\nOCCA_HIP_ERROR(\"Device: malloc\",\nhipMalloc(&(mem.hipPtr), bytes));\n@@ -408,8 +419,8 @@ namespace occa {\nhip::memory &mem = *(new hip::memory(this, bytes, props));\n- OCCA_HIP_ERROR(\"Device: Setting Context\",\n- hipCtxSetCurrent(hipContext));\n+ OCCA_HIP_ERROR(\"Device: Setting Device\",\n+ hipSetDevice(deviceID));\nOCCA_HIP_ERROR(\"Device: malloc host\",\nhipHostMalloc((void**) &(mem.mappedPtr), bytes));\nOCCA_HIP_ERROR(\"Device: get device pointer from host\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/hip/kernel.cpp",
"new_path": "src/modes/hip/kernel.cpp",
"diff": "@@ -37,6 +37,10 @@ namespace occa {\n}\n}\n+ hipStream_t& kernel::getHipStream() const {\n+ return ((device*) modeDevice)->getHipStream();\n+ }\n+\nint kernel::maxDims() const {\nreturn 3;\n}\n@@ -71,7 +75,7 @@ namespace occa {\n// HIP expects kernel arguments to be byte-aligned so we add padding to arguments\nchar *dataPtr = (char*) &(vArgs[0]);\nint padding = 0;\n- for (int i = 0; i < kArgCount; ++i) {\n+ for (int i = 0; i < args; ++i) {\nconst kernelArgData &arg = arguments[i];\nsize_t bytes;\n@@ -101,7 +105,7 @@ namespace occa {\nhipModuleLaunchKernel(hipFunction,\nouterDims.x, outerDims.y, outerDims.z,\ninnerDims.x, innerDims.y, innerDims.z,\n- 0, *((hipStream_t*) modeDevice->currentStream),\n+ 0, getHipStream(),\nNULL, (void**) &config));\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/hip/memory.cpp",
"new_path": "src/modes/hip/memory.cpp",
"diff": "@@ -28,12 +28,16 @@ namespace occa {\nhipHostFree(mappedPtr));\nmappedPtr = NULL;\n} else if (hipPtr) {\n- hipHostFree(hipPtr);\n+ hipFree(hipPtr);\nhipPtr = 0;\n}\nsize = 0;\n}\n+ hipStream_t& memory::getHipStream() const {\n+ return ((device*) modeDevice)->getHipStream();\n+ }\n+\nkernelArg memory::makeKernelArg() const {\nkernelArgData arg;\n@@ -60,7 +64,6 @@ namespace occa {\nconst udim_t bytes,\nconst udim_t offset,\nconst occa::properties &props) {\n- const hipStream_t &stream = *((hipStream_t*) modeDevice->currentStream);\nconst bool async = props.get(\"async\", false);\nif (!async) {\n@@ -73,7 +76,7 @@ namespace occa {\nhipMemcpyHtoDAsync((char*) hipPtr + offset,\nconst_cast<void*>(src),\nbytes,\n- stream) );\n+ getHipStream()) );\n}\n}\n@@ -82,7 +85,6 @@ namespace occa {\nconst udim_t destOffset,\nconst udim_t srcOffset,\nconst occa::properties &props) {\n- const hipStream_t &stream = *((hipStream_t*) modeDevice->currentStream);\nconst bool async = props.get(\"async\", false);\nif (!async) {\n@@ -95,7 +97,7 @@ namespace occa {\nhipMemcpyDtoDAsync((char*) hipPtr + destOffset,\n(char*) ((memory*) src)->hipPtr + srcOffset,\nbytes,\n- stream) );\n+ getHipStream()) );\n}\n}\n@@ -110,7 +112,6 @@ namespace occa {\nconst udim_t bytes,\nconst udim_t offset,\nconst occa::properties &props) const {\n- const hipStream_t &stream = *((hipStream_t*) modeDevice->currentStream);\nconst bool async = props.get(\"async\", false);\nif (!async) {\n@@ -123,7 +124,7 @@ namespace occa {\nhipMemcpyDtoHAsync(dest,\n(char*) hipPtr + offset,\nbytes,\n- stream) );\n+ getHipStream()) );\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/modes/hip/stream.cpp",
"diff": "+#include <occa/defines.hpp>\n+\n+#if OCCA_HIP_ENABLED\n+\n+#include <occa/modes/hip/stream.hpp>\n+#include <occa/modes/hip/utils.hpp>\n+\n+namespace occa {\n+ namespace hip {\n+ stream::stream(modeDevice_t *modeDevice_,\n+ const occa::properties &properties_,\n+ hipStream_t hipStream_) :\n+ modeStream_t(modeDevice_, properties_),\n+ hipStream(hipStream_) {}\n+\n+ stream::~stream() {\n+ OCCA_HIP_ERROR(\"Device: freeStream\",\n+ hipStreamDestroy(hipStream));\n+ }\n+ }\n+}\n+\n+#endif\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/modes/hip/streamTag.cpp",
"diff": "+#include <occa/defines.hpp>\n+\n+#if OCCA_HIP_ENABLED\n+\n+#include <occa/modes/hip/streamTag.hpp>\n+#include <occa/modes/hip/utils.hpp>\n+\n+namespace occa {\n+ namespace hip {\n+ streamTag::streamTag(modeDevice_t *modeDevice_,\n+ hipEvent_t hipEvent_) :\n+ modeStreamTag_t(modeDevice_),\n+ hipEvent(hipEvent_) {}\n+\n+ streamTag::~streamTag() {\n+ OCCA_HIP_ERROR(\"streamTag: Freeing hipEvent_t\",\n+ hipEventDestroy(hipEvent));\n+ }\n+ }\n+}\n+\n+#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/hip/utils.cpp",
"new_path": "src/modes/hip/utils.cpp",
"diff": "@@ -16,7 +16,7 @@ namespace occa {\nbool init() {\nstatic bool isInitialized = false;\nif (!isInitialized) {\n- isInitialized = hipInit(0);\n+ isInitialized = !hipInit(0);\n}\nreturn isInitialized;\n}\n@@ -54,8 +54,8 @@ namespace occa {\nvoid enablePeerToPeer(hipCtx_t context) {\n- OCCA_HIP_ERROR(\"Enabling Peer-to-Peer\",\n- hipCtxEnablePeerAccess(context, 0) );\n+ // OCCA_HIP_ERROR(\"Enabling Peer-to-Peer\",\n+ // hipCtxEnablePeerAccess(context, 0) );\n}\nvoid checkPeerToPeer(hipDevice_t destDevice,\n@@ -151,31 +151,21 @@ namespace occa {\n<< \"] does not support unified memory prefetching\");\n}\n- hipCtx_t getContext(occa::device device) {\n- return ((hip::device*) device.getModeDevice())->hipContext;\n- }\n-\n- void* getMappedPtr(occa::memory mem) {\n- hip::memory *handle = (hip::memory*) mem.getMHandle();\n- return handle ? handle->mappedPtr : NULL;\n- }\n-\nocca::device wrapDevice(hipDevice_t device,\n- hipCtx_t context,\nconst occa::properties &props) {\n- occa::properties allProps = props;\n+ occa::properties allProps;\nallProps[\"mode\"] = \"HIP\";\n- allProps[\"device_id\"] = -1;\n+ allProps[\"deviceID\"] = -1;\nallProps[\"wrapped\"] = true;\n+ allProps += props;\nhip::device &dev = *(new hip::device(allProps));\ndev.dontUseRefs();\ndev.hipDevice = device;\n- dev.hipContext = context;\n- dev.currentStream = dev.createStream();\n+ dev.currentStream = dev.createStream(allProps[\"stream\"]);\nreturn occa::device(&dev);\n}\n@@ -185,25 +175,17 @@ namespace occa {\nconst udim_t bytes,\nconst occa::properties &props) {\n- hip::memory &mem = *(new hip::memory(props));\n+ hip::memory &mem = *(new hip::memory(device.getModeDevice(),\n+ bytes,\n+ props));\nmem.dontUseRefs();\n- mem.modeDevice = device.getModeDevice();\nmem.ptr = (char*) ptr;\n- mem.size = bytes;\nmem.mappedPtr = NULL;\nreturn occa::memory(&mem);\n}\n- hipEvent_t& event(streamTag &tag) {\n- return (hipEvent_t&) tag.modeTag;\n- }\n-\n- const hipEvent_t& event(const streamTag &tag) {\n- return (const hipEvent_t&) tag.modeTag;\n- }\n-\nvoid warn(hipError_t errorCode,\nconst std::string &filename,\nconst std::string &function,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/opencl/device.cpp",
"new_path": "src/modes/opencl/device.cpp",
"diff": "@@ -91,10 +91,19 @@ namespace occa {\n//---[ Stream ]---------------------\nmodeStream_t* device::createStream(const occa::properties &props) {\ncl_int error;\n+#ifdef CL_VERSION_2_0\n+ cl_queue_properties clProps[] = {CL_QUEUE_PROPERTIES,\n+ CL_QUEUE_PROFILING_ENABLE, 0};\n+ cl_command_queue commandQueue = clCreateCommandQueueWithProperties(clContext,\n+ clDevice,\n+ clProps,\n+ &error);\n+#else\ncl_command_queue commandQueue = clCreateCommandQueue(clContext,\nclDevice,\nCL_QUEUE_PROFILING_ENABLE,\n&error);\n+#endif\nOCCA_OPENCL_ERROR(\"Device: createStream\", error);\nreturn new stream(this, props, commandQueue);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[HIP/OpenCL] Updates for HIP backend and updating deprecated OpenCL APIs
|
378,355 |
14.05.2019 15:44:13
| 18,000 |
ebdb659c804f91f1e0f32fd700f9fe229458033c
|
Update src/modes/hip/utils.cpp
|
[
{
"change_type": "MODIFY",
"old_path": "src/modes/hip/utils.cpp",
"new_path": "src/modes/hip/utils.cpp",
"diff": "@@ -156,7 +156,7 @@ namespace occa {\nocca::properties allProps;\nallProps[\"mode\"] = \"HIP\";\n- allProps[\"deviceID\"] = -1;\n+ allProps[\"device_id\"] = -1;\nallProps[\"wrapped\"] = true;\nallProps += props;\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
Update src/modes/hip/utils.cpp
Co-Authored-By: David Medina <dmed256@gmail.com>
|
378,349 |
21.07.2019 22:55:16
| 18,000 |
a55b50ca3db6770195ca0367288526eb10046414
|
[Defines] Updates OCCA version
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/defines/occa.hpp",
"new_path": "include/occa/defines/occa.hpp",
"diff": "#define OCCA_MAJOR_VERSION 1\n#define OCCA_MINOR_VERSION 0\n-#define OCCA_PATCH_VERSION 8\n-#define OCCA_VERSION 10008\n-#define OCCA_VERSION_STR \"1.0.8\"\n+#define OCCA_PATCH_VERSION 9\n+#define OCCA_VERSION 10009\n+#define OCCA_VERSION_STR \"1.0.9\"\n#define OKL_MAJOR_VERSION 1\n#define OKL_MINOR_VERSION 0\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Defines] Updates OCCA version (#234)
|
378,343 |
01.08.2019 13:41:19
| 18,000 |
e84a529c6dfb7f2a6777347b0b45e6d0a32c6c58
|
Copy to prefix instead of prefix/subfolder
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/scripts/shellTools.sh",
"new_path": "include/occa/scripts/shellTools.sh",
"diff": "@@ -542,8 +542,8 @@ function installOcca {\nreturn\nfi\nmkdir -p \"${PREFIX}\"\n- cp -r bin \"${PREFIX}/bin\"\n- cp -r include \"${PREFIX}/include\"\n- cp -r lib \"${PREFIX}/lib\"\n+ cp -r bin \"${PREFIX}\"\n+ cp -r include \"${PREFIX}\"\n+ cp -r lib \"${PREFIX}\"\n}\n#=======================================\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
Copy to prefix instead of prefix/subfolder
|
378,343 |
01.08.2019 14:03:26
| 18,000 |
ce4df262600bfc06ade8812cb67e8da1ec1c37a1
|
Add a warning if install prefix exists
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/scripts/shellTools.sh",
"new_path": "include/occa/scripts/shellTools.sh",
"diff": "@@ -541,7 +541,11 @@ function installOcca {\nif [ -z \"${PREFIX}\" ]; then\nreturn\nfi\n+ if [ -d \"${PREFIX}\" ]; then\n+ echo \"Warning: Install PREFIX=${PREFIX} already exists.\"\n+ else\nmkdir -p \"${PREFIX}\"\n+ fi\ncp -r bin \"${PREFIX}\"\ncp -r include \"${PREFIX}\"\ncp -r lib \"${PREFIX}\"\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
Add a warning if install prefix exists
|
378,349 |
14.10.2019 23:22:14
| 18,000 |
bb7e1730165c4b17b62206ea5bf7a461340262a9
|
[OpenCL] Adds @ global attribute
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/lang/builtins/attributes.hpp",
"new_path": "include/occa/lang/builtins/attributes.hpp",
"diff": "#include <occa/lang/builtins/attributes/barrier.hpp>\n#include <occa/lang/builtins/attributes/dim.hpp>\n#include <occa/lang/builtins/attributes/exclusive.hpp>\n+#include <occa/lang/builtins/attributes/globalPtr.hpp>\n#include <occa/lang/builtins/attributes/implicitArg.hpp>\n#include <occa/lang/builtins/attributes/inner.hpp>\n#include <occa/lang/builtins/attributes/kernel.hpp>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "include/occa/lang/builtins/attributes/globalPtr.hpp",
"diff": "+#ifndef OCCA_LANG_BUILTINS_ATTRIBUTES_GLOBALPTR_HEADER\n+#define OCCA_LANG_BUILTINS_ATTRIBUTES_GLOBALPTR_HEADER\n+\n+#include <occa/lang/attribute.hpp>\n+\n+namespace occa {\n+ namespace lang {\n+ namespace attributes {\n+ //---[ @globalPtr ]---------------\n+ class globalPtr : public attribute_t {\n+ public:\n+ globalPtr();\n+\n+ virtual const std::string& name() const;\n+\n+ virtual bool forVariable() const;\n+ virtual bool forStatement(const int sType) const;\n+\n+ virtual bool isValid(const attributeToken_t &attr) const;\n+ };\n+ //================================\n+ }\n+ }\n+}\n+\n+#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/lang/modes/opencl.hpp",
"new_path": "include/occa/lang/modes/opencl.hpp",
"diff": "@@ -10,8 +10,9 @@ namespace occa {\npublic:\nqualifier_t constant;\nqualifier_t kernel;\n- qualifier_t global;\nqualifier_t local;\n+ // Hack until code-transformation API is done\n+ static qualifier_t global;\nopenclParser(const occa::properties &settings_ = occa::properties());\n@@ -31,8 +32,14 @@ namespace occa {\nvoid updateConstToConstant();\nvoid setLocalQualifiers();\n-\nstatic bool sharedVariableMatcher(exprNode &expr);\n+\n+ void setGlobalQualifiers();\n+ static bool updateGlobalVariables(statement_t &smnt);\n+ static void addGlobalToFunctionArgs(function_t &func);\n+ static void addGlobalToStruct(struct_t &struct_);\n+ static void addGlobalToVariable(variable_t &var);\n+\nstatic bool updateScopeStructVariables(statement_t &smnt);\nstatic void addStructToVariable(variable_t &var);\nstatic void addStructToFunctionArgs(function_t &func);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/lang/builtins/attributes/globalPtr.cpp",
"diff": "+#include <occa/lang/expr.hpp>\n+#include <occa/lang/statement.hpp>\n+#include <occa/lang/builtins/attributes/globalPtr.hpp>\n+\n+namespace occa {\n+ namespace lang {\n+ namespace attributes {\n+ //---[ @globalPtr ]-----------------------\n+ globalPtr::globalPtr() {}\n+\n+ const std::string& globalPtr::name() const {\n+ static std::string name_ = \"globalPtr\";\n+ return name_;\n+ }\n+\n+ bool globalPtr::forVariable() const {\n+ return true;\n+ }\n+\n+ bool globalPtr::forStatement(const int sType) const {\n+ return (sType & statementType::declaration);\n+ }\n+\n+ bool globalPtr::isValid(const attributeToken_t &attr) const {\n+ if (attr.kwargs.size()) {\n+ attr.printError(\"[@globalPtr] does not take kwargs\");\n+ return false;\n+ }\n+ if (attr.args.size()) {\n+ attr.printError(\"[@globalPtr] does not take arguments\");\n+ return false;\n+ }\n+ return true;\n+ }\n+ //==================================\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/lang/modes/opencl.cpp",
"new_path": "src/lang/modes/opencl.cpp",
"diff": "namespace occa {\nnamespace lang {\nnamespace okl {\n+ qualifier_t openclParser::global(\"__global\", qualifierType::custom);\n+\nopenclParser::openclParser(const occa::properties &settings_) :\nwithLauncher(settings_),\nconstant(\"__constant\", qualifierType::custom),\nkernel(\"__kernel\", qualifierType::custom),\n- global(\"__global\", qualifierType::custom),\nlocal(\"__local\", qualifierType::custom) {\nokl::addAttributes(*this);\n@@ -40,6 +41,9 @@ namespace occa {\nif (!success) return;\nsetLocalQualifiers();\n+\n+ if (!success) return;\n+ setGlobalQualifiers();\n}\nvoid openclParser::afterKernelSplit() {\n@@ -143,6 +147,68 @@ namespace occa {\nreturn expr.hasAttribute(\"shared\");\n}\n+ void openclParser::setGlobalQualifiers() {\n+ statementPtrVector statements;\n+ findStatements((statementType::declaration |\n+ statementType::struct_ |\n+ statementType::functionDecl |\n+ statementType::function),\n+ root,\n+ updateGlobalVariables,\n+ statements);\n+ }\n+\n+ bool openclParser::updateGlobalVariables(statement_t &smnt) {\n+ if (smnt.type() & statementType::function) {\n+ addGlobalToFunctionArgs(\n+ smnt.to<functionStatement>().function\n+ );\n+ }\n+ else if (smnt.type() & statementType::functionDecl) {\n+ addGlobalToFunctionArgs(\n+ smnt.to<functionDeclStatement>().function\n+ );\n+ }\n+ else if (smnt.type() & statementType::struct_) {\n+ addGlobalToStruct(\n+ smnt.to<structStatement>().struct_\n+ );\n+ }\n+ else {\n+ declarationStatement &declSmnt = smnt.to<declarationStatement>();\n+ const int declCount = declSmnt.declarations.size();\n+ for (int i = 0; i < declCount; ++i) {\n+ addGlobalToVariable(\n+ *(declSmnt.declarations[i].variable)\n+ );\n+ }\n+ }\n+ return false;\n+ }\n+\n+ void openclParser::addGlobalToFunctionArgs(function_t &func) {\n+ const int argc = (int) func.args.size();\n+ for (int i = 0; i < argc; ++i) {\n+ variable_t *arg = func.args[i];\n+ if (arg) {\n+ addGlobalToVariable(*arg);\n+ }\n+ }\n+ }\n+\n+ void openclParser::addGlobalToStruct(struct_t &struct_) {\n+ const int fieldCount = (int) struct_.fields.size();\n+ for (int i = 0; i < fieldCount; ++i) {\n+ addGlobalToVariable(struct_.fields[i]);\n+ }\n+ }\n+\n+ void openclParser::addGlobalToVariable(variable_t &var) {\n+ if (var.hasAttribute(\"globalPtr\")) {\n+ var.add(0, global);\n+ }\n+ }\n+\nbool openclParser::updateScopeStructVariables(statement_t &smnt) {\nif (smnt.type() & statementType::function) {\naddStructToFunctionArgs(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/lang/parser.cpp",
"new_path": "src/lang/parser.cpp",
"diff": "@@ -62,6 +62,7 @@ namespace occa {\naddAttribute<attributes::tile>();\naddAttribute<attributes::restrict>();\naddAttribute<attributes::implicitArg>();\n+ addAttribute<attributes::globalPtr>();\n}\nparser_t::~parser_t() {\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[OpenCL] Adds @ global attribute
|
378,353 |
03.09.2019 09:16:00
| -7,200 |
a9baf3b7f6f12b011a54130126fdce5dc270a228
|
Fixed compile of CPP examples.
|
[
{
"change_type": "MODIFY",
"old_path": "examples/cpp/01_add_vectors/CMakeLists.txt",
"new_path": "examples/cpp/01_add_vectors/CMakeLists.txt",
"diff": "-COMPILE_C_EXAMPLE(01_add_vectors main.cpp)\n+COMPILE_CPP_EXAMPLE(01_add_vectors main.cpp)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/02_background_device/CMakeLists.txt",
"new_path": "examples/cpp/02_background_device/CMakeLists.txt",
"diff": "-COMPILE_C_EXAMPLE(02_background_device main.cpp)\n+COMPILE_CPP_EXAMPLE(02_background_device main.cpp)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/03_inline_okl/CMakeLists.txt",
"new_path": "examples/cpp/03_inline_okl/CMakeLists.txt",
"diff": "-COMPILE_C_EXAMPLE(03_inline_okl main.cpp)\n+COMPILE_CPP_EXAMPLE(03_inline_okl main.cpp)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/04_reduction/CMakeLists.txt",
"new_path": "examples/cpp/04_reduction/CMakeLists.txt",
"diff": "-COMPILE_C_EXAMPLE(04_reduction main.cpp)\n+COMPILE_CPP_EXAMPLE(04_reduction main.cpp)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/05_building_kernels/CMakeLists.txt",
"new_path": "examples/cpp/05_building_kernels/CMakeLists.txt",
"diff": "-COMPILE_C_EXAMPLE(05_building_kernels main.cpp)\n+COMPILE_CPP_EXAMPLE(05_building_kernels main.cpp)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/06_unified_memory/CMakeLists.txt",
"new_path": "examples/cpp/06_unified_memory/CMakeLists.txt",
"diff": "-COMPILE_C_EXAMPLE(06_unified_memory main.cpp)\n+COMPILE_CPP_EXAMPLE(06_unified_memory main.cpp)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/07_dtypes/CMakeLists.txt",
"new_path": "examples/cpp/07_dtypes/CMakeLists.txt",
"diff": "-COMPILE_C_EXAMPLE(07_dtypes main.cpp)\n+COMPILE_CPP_EXAMPLE(07_dtypes main.cpp)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/08_arrays/CMakeLists.txt",
"new_path": "examples/cpp/08_arrays/CMakeLists.txt",
"diff": "-COMPILE_C_EXAMPLE(08_arrays main.cpp)\n+COMPILE_CPP_EXAMPLE(08_arrays main.cpp)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/09_streams/CMakeLists.txt",
"new_path": "examples/cpp/09_streams/CMakeLists.txt",
"diff": "-COMPILE_C_EXAMPLE(09_streams main.cpp)\n+COMPILE_CPP_EXAMPLE(09_streams main.cpp)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/10_mpi/CMakeLists.txt",
"new_path": "examples/cpp/10_mpi/CMakeLists.txt",
"diff": "-COMPILE_C_EXAMPLE(10_mpi main.cpp)\n+COMPILE_CPP_EXAMPLE(10_mpi main.cpp)\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
Fixed compile of CPP examples.
|
378,353 |
03.09.2019 14:44:37
| -7,200 |
e4a557ee72a4b8da0cd434f3b293e43067752bec
|
Added OCCA_BINARY_DIR to specify build directory.
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/env.hpp",
"new_path": "include/occa/tools/env.hpp",
"diff": "@@ -17,6 +17,7 @@ namespace occa {\nextern size_t OCCA_MEM_BYTE_ALIGN;\nextern strVector OCCA_PATH;\nextern bool OCCA_COLOR_ENABLED;\n+ extern std::string OCCA_BINARY_DIR;\nproperties& baseSettings();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/serial/device.cpp",
"new_path": "src/modes/serial/device.cpp",
"diff": "@@ -265,7 +265,13 @@ namespace occa {\n<< ' ' << sourceFilename\n<< \" -o \" << binaryFilename\n<< \" -I\" << env::OCCA_DIR << \"include\"\n- << \" -L\" << env::OCCA_DIR << \"lib -locca\";\n+ << \" -I\" << env::OCCA_DIR << \"include\";\n+ if (! env::OCCA_BINARY_DIR.empty() ) {\n+ command << \" -I \" << env::OCCA_BINARY_DIR\n+ << \" -L \" << env::OCCA_BINARY_DIR << \"/src\";\n+ }\n+\n+ command << \" -L\" << env::OCCA_DIR << \"lib -locca\";\ncommand << std::endl;\n#else\ncommand << kernelProps[\"compiler\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/env.cpp",
"new_path": "src/tools/env.cpp",
"diff": "@@ -24,6 +24,7 @@ namespace occa {\nsize_t OCCA_MEM_BYTE_ALIGN;\nstrVector OCCA_PATH;\nbool OCCA_COLOR_ENABLED;\n+ std::string OCCA_BINARY_DIR;\nproperties& baseSettings() {\nstatic properties settings_;\n@@ -71,6 +72,7 @@ namespace occa {\nPWD = env::var(\"PWD\");\nPATH = env::var(\"PATH\");\nLD_LIBRARY_PATH = env::var(\"LD_LIBRARY_PATH\");\n+ OCCA_BINARY_DIR = env::var(\"OCCA_BINARY_DIR\");\nio::endWithSlash(HOME);\nio::endWithSlash(PWD);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
Added OCCA_BINARY_DIR to specify build directory.
|
378,353 |
06.09.2019 13:45:26
| -7,200 |
e1518deddc188b2d28d9a43010791af3705fc2fa
|
Adding dependencies of examples.
|
[
{
"change_type": "MODIFY",
"old_path": "examples/c/01_add_vectors/CMakeLists.txt",
"new_path": "examples/c/01_add_vectors/CMakeLists.txt",
"diff": "COMPILE_C_EXAMPLE(01_add_vector main.c)\nADD_CUSTOM_TARGET(c_example_01_addVectors_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/addVectors.okl addVectors.okl)\n+ADD_DEPENDENCIES(examples_c_01_add_vector c_example_01_addVectors_okl)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/c/02_background_device/CMakeLists.txt",
"new_path": "examples/c/02_background_device/CMakeLists.txt",
"diff": "COMPILE_C_EXAMPLE(02_background_device main.c)\n+\n+ADD_CUSTOM_TARGET(c_example_02_addVectors_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/addVectors.okl addVectors.okl)\n+ADD_DEPENDENCIES(examples_c_02_background_device c_example_02_addVectors_okl)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/c/04_reduction/CMakeLists.txt",
"new_path": "examples/c/04_reduction/CMakeLists.txt",
"diff": "COMPILE_C_EXAMPLE(04_reduction main.c)\n+\n+ADD_CUSTOM_TARGET(c_example_04_reduction_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/reduction.okl reduction.okl)\n+ADD_DEPENDENCIES(examples_c_04_reduction c_example_04_reduction_okl)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/01_add_vectors/CMakeLists.txt",
"new_path": "examples/cpp/01_add_vectors/CMakeLists.txt",
"diff": "COMPILE_CPP_EXAMPLE(01_add_vectors main.cpp)\n+\n+ADD_CUSTOM_TARGET(cpp_example_01_addVectors_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/addVectors.okl addVectors.okl)\n+ADD_DEPENDENCIES(examples_cpp_01_add_vectors cpp_example_01_addVectors_okl)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/02_background_device/CMakeLists.txt",
"new_path": "examples/cpp/02_background_device/CMakeLists.txt",
"diff": "COMPILE_CPP_EXAMPLE(02_background_device main.cpp)\n+\n+ADD_CUSTOM_TARGET(cpp_example_02_addVectors_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/addVectors.okl addVectors.okl)\n+ADD_DEPENDENCIES(examples_cpp_02_background_device cpp_example_02_addVectors_okl)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/04_reduction/CMakeLists.txt",
"new_path": "examples/cpp/04_reduction/CMakeLists.txt",
"diff": "COMPILE_CPP_EXAMPLE(04_reduction main.cpp)\n+\n+ADD_CUSTOM_TARGET(cpp_example_04_reduction_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/reduction.okl reduction.okl)\n+ADD_DEPENDENCIES(examples_cpp_04_reduction cpp_example_04_reduction_okl)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/06_unified_memory/CMakeLists.txt",
"new_path": "examples/cpp/06_unified_memory/CMakeLists.txt",
"diff": "COMPILE_CPP_EXAMPLE(06_unified_memory main.cpp)\n+\n+ADD_CUSTOM_TARGET(cpp_example_06_addVectors_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/addVectors.okl addVectors.okl)\n+ADD_DEPENDENCIES(examples_cpp_06_unified_memory cpp_example_06_addVectors_okl)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/07_dtypes/CMakeLists.txt",
"new_path": "examples/cpp/07_dtypes/CMakeLists.txt",
"diff": "COMPILE_CPP_EXAMPLE(07_dtypes main.cpp)\n+\n+ADD_CUSTOM_TARGET(cpp_example_07_addVectors_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/addVectors.okl addVectors.okl)\n+ADD_DEPENDENCIES(examples_cpp_07_dtypes cpp_example_07_addVectors_okl)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/08_arrays/CMakeLists.txt",
"new_path": "examples/cpp/08_arrays/CMakeLists.txt",
"diff": "COMPILE_CPP_EXAMPLE(08_arrays main.cpp)\n+\n+ADD_CUSTOM_TARGET(cpp_example_08_smallTranspose_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/smallTranspose.okl smallTranspose.okl)\n+ADD_DEPENDENCIES(examples_cpp_08_arrays cpp_example_08_smallTranspose_okl)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/09_streams/CMakeLists.txt",
"new_path": "examples/cpp/09_streams/CMakeLists.txt",
"diff": "COMPILE_CPP_EXAMPLE(09_streams main.cpp)\n+\n+ADD_CUSTOM_TARGET(cpp_example_09_addVectors_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/addVectors.okl addVectors.okl)\n+ADD_DEPENDENCIES(examples_cpp_09_streams cpp_example_09_addVectors_okl)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/cpp/10_mpi/CMakeLists.txt",
"new_path": "examples/cpp/10_mpi/CMakeLists.txt",
"diff": "IF (MPI_FOUND)\nINCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})\nCOMPILE_CPP_EXAMPLE(10_mpi main.cpp)\n+\n+ ADD_CUSTOM_TARGET(cpp_example_10_addVectors_okl ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/addVectors.okl addVectors.okl)\n+ ADD_DEPENDENCIES(examples_cpp_10_mpi cpp_example_10_addVectors_okl)\nENDIF()\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
Adding dependencies of examples.
|
378,353 |
09.09.2019 14:47:52
| -7,200 |
17843ab5eede9fc8c83fbaa5a4d9bd85d3a65bb1
|
[CMake] OpenMP support is now optional.
|
[
{
"change_type": "MODIFY",
"old_path": "CMakeLists.txt",
"new_path": "CMakeLists.txt",
"diff": "@@ -19,16 +19,20 @@ project (occa)\nOPTION(ALLOW_CUDA \"Allow CUDA\" ON)\nOPTION(ALLOW_MPI \"Allow MPI\" OFF)\n+OPTION(ALLOW_OPENMP \"Allow OpenMP\" ON)\nset(PROJ_DIR ${CMAKE_CURRENT_SOURCE_DIR})\nlink_directories(${PROJ_DIR}/lib)\nfind_package(Threads REQUIRED)\n-find_package(OpenMP REQUIRED)\nSET(CUDA_USE_STATIC_CUDA_RUNTIME OFF)\nfind_package(OpenCL)\n+IF (ALLOW_OPENMP)\n+ INCLUDE(OpenMP)\n+ENDIF()\n+\n# searches for CUDA if allowed\nIF (ALLOW_CUDA)\ninclude(CUDA)\n@@ -52,9 +56,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)\nset(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -Wno-c++11-long-long\")\nset(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-c++11-long-long\")\n-set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}\")\n-\n-set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}\")\nset(CMAKE_EXE_LINKER_FLAGS \"${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}\")\ninclude_directories(${PROJECT_BINARY_DIR})\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "cmake/OpenMP.cmake",
"diff": "+find_package(OpenMP)\n+\n+if (OPENMP_CXX_FOUND)\n+ SET(WITH_OPENMP 1)\n+ SET(OCCA_OPENMP_ENABLED 1)\n+\n+ set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}\")\n+ set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}\")\n+endif()\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[CMake] OpenMP support is now optional.
|
378,353 |
09.09.2019 16:23:34
| -7,200 |
93621e4dd84c600b064c131dc3936726e8459731
|
[CMake] OpenCL support is now optional.
|
[
{
"change_type": "MODIFY",
"old_path": "CMakeLists.txt",
"new_path": "CMakeLists.txt",
"diff": "@@ -20,6 +20,7 @@ project (occa)\nOPTION(ALLOW_CUDA \"Allow CUDA\" ON)\nOPTION(ALLOW_MPI \"Allow MPI\" OFF)\nOPTION(ALLOW_OPENMP \"Allow OpenMP\" ON)\n+OPTION(ALLOW_OPENCL \"Allow OpenCL\" ON)\nset(PROJ_DIR ${CMAKE_CURRENT_SOURCE_DIR})\n@@ -27,22 +28,20 @@ link_directories(${PROJ_DIR}/lib)\nfind_package(Threads REQUIRED)\nSET(CUDA_USE_STATIC_CUDA_RUNTIME OFF)\n-find_package(OpenCL)\nIF (ALLOW_OPENMP)\nINCLUDE(OpenMP)\nENDIF()\n+IF (ALLOW_OPENCL)\n+ INCLUDE(OpenCL)\n+ENDIF()\n+\n# searches for CUDA if allowed\nIF (ALLOW_CUDA)\ninclude(CUDA)\nENDIF()\n-IF (OpenCL_FOUND)\n- SET(WITH_OPENCL 1)\n- include_directories( ${OpenCL_INCLUDE_DIRS} )\n-ENDIF()\n-\n# searches for MPI if allowed\nIF (ALLOW_MPI)\ninclude(MPI)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "cmake/OpenCL.cmake",
"diff": "+find_package(OpenCL)\n+\n+IF (OpenCL_FOUND)\n+ SET(WITH_OPENCL 1)\n+ SET(OCCA_OPENCL_ENABLED 1)\n+ include_directories( ${OpenCL_INCLUDE_DIRS} )\n+ENDIF()\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[CMake] OpenCL support is now optional.
|
378,353 |
10.09.2019 10:37:55
| -7,200 |
11c4b347c7788da3a445a144bcc69c683547d35f
|
[CMake] Added install targets.
|
[
{
"change_type": "MODIFY",
"old_path": "CMakeLists.txt",
"new_path": "CMakeLists.txt",
"diff": "@@ -63,8 +63,11 @@ SET(OCCA_BINARY_DIR ${PROJECT_BINARY_DIR} )\nCONFIGURE_FILE( scripts/compiledDefinesTemplate.hpp.in ${PROJECT_BINARY_DIR}/occa/defines/compiledDefines.hpp )\n# will not work because build directory unknown to runtime compiler\n# CONFIGURE_FILE( scripts/compiledDefinesTemplate.hpp.in ${PROJECT_SOURCE_DIR}/include/occa/defines/compiledDefines.hpp )\n+install(FILES ${PROJECT_BINARY_DIR}/occa/defines/compiledDefines.hpp DESTINATION include/occa/defines)\nadd_subdirectory(src)\nadd_subdirectory(bin)\n# add_subdirectory(tests)\nadd_subdirectory(examples)\n+\n+install(DIRECTORY include/ DESTINATION include)\n"
},
{
"change_type": "MODIFY",
"old_path": "bin/CMakeLists.txt",
"new_path": "bin/CMakeLists.txt",
"diff": "add_executable(occa occa.cpp)\ntarget_link_libraries(occa libocca)\n+install(TARGETS occa DESTINATION bin )\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/CMakeLists.txt",
"new_path": "src/CMakeLists.txt",
"diff": "@@ -23,3 +23,5 @@ IF (WITH_MPI)\nENDIF()\ntarget_link_libraries(libocca ${LIBOCCA_LIBRARIES} )\n+\n+install(TARGETS libocca DESTINATION lib )\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[CMake] Added install targets.
|
378,353 |
11.09.2019 13:02:01
| -7,200 |
420be789321989a83eee7783acb4d8f1328dce91
|
[CMake] OS no longer hardcoded. Metal supported on OSX.
|
[
{
"change_type": "MODIFY",
"old_path": "CMakeLists.txt",
"new_path": "CMakeLists.txt",
"diff": "@@ -17,10 +17,13 @@ ENDIF()\n# Set project\nproject (occa)\n+include(OS)\n+\nOPTION(ALLOW_CUDA \"Allow CUDA\" ON)\nOPTION(ALLOW_MPI \"Allow MPI\" OFF)\nOPTION(ALLOW_OPENMP \"Allow OpenMP\" ON)\nOPTION(ALLOW_OPENCL \"Allow OpenCL\" ON)\n+OPTION(ALLOW_METAL \"Allow Metal\" ON)\nset(PROJ_DIR ${CMAKE_CURRENT_SOURCE_DIR})\n@@ -47,6 +50,10 @@ IF (ALLOW_MPI)\ninclude(MPI)\nENDIF()\n+IF (ALLOW_METAL)\n+ include(Metal)\n+ENDIF()\n+\nadd_definitions(-DUSE_CMAKE)\ninclude_directories(${PROJ_DIR}/include)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "cmake/Metal.cmake",
"diff": "+IF (APPLE)\n+ find_library(METAL_LIBRARY Metal)\n+ find_library(CORE_SERVICES CoreServices)\n+ find_library(APP_KIT AppKit)\n+ENDIF()\n+\n+IF (METAL_LIBRARY AND CORE_SERVICES AND APP_KIT)\n+ SET(WITH_METAL 1)\n+ SET(OCCA_METAL_ENABLED 1)\n+ENDIF()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "cmake/OS.cmake",
"diff": "+# Test Apple first because UNIX==true for Apple and Linux.\n+IF (APPLE)\n+ SET(OCCA_OS \"OCCA_MACOS_OS\")\n+ELSEIF (UNIX)\n+ SET(OCCA_OS \"OCCA_LINUX_OS\")\n+ELSE()\n+ SET(OCCA_OS \"OCCA_WINDOWS_OS\")\n+ENDIF()\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/compiledDefinesTemplate.hpp.in",
"new_path": "scripts/compiledDefinesTemplate.hpp.in",
"diff": "# define OCCA_WINUX_OS (OCCA_LINUX_OS | OCCA_WINDOWS_OS)\n#endif\n-// Values are hardcoded for now\n-#define OCCA_OS OCCA_LINUX_OS\n+#cmakedefine OCCA_OS @OCCA_OS@\n#define OCCA_USING_VS 0\n#define OCCA_UNSAFE 0\n"
},
{
"change_type": "MODIFY",
"old_path": "src/CMakeLists.txt",
"new_path": "src/CMakeLists.txt",
"diff": "file(GLOB_RECURSE sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} \"*.cpp\")\nlist(REMOVE_ITEM sources core/kernelOperators.cpp tools/runFunction.cpp)\n+IF (WITH_METAL)\n+ file(GLOB_RECURSE sources_metal RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} \"*.mm\")\n+ SET(sources ${sources} ${sources_metal})\n+ENDIF()\n+\n+\n# dontCompile = $(OCCA_DIR)/src/core/kernelOperators.cpp $(OCCA_DIR)/src/tools/runFunction.cpp\nadd_library(libocca SHARED ${sources})\n@@ -22,6 +28,10 @@ IF (WITH_MPI)\nSET(LIBOCCA_LIBRARIES ${MPI_CXX_LIBRARIES} ${MPI_C_LIBRARIES} ${LIBOCCA_LIBRARIES})\nENDIF()\n+IF (WITH_METAL)\n+ SET(LIBOCCA_LIBRARIES ${METAL_LIBRARY} ${CORE_SERVICES} ${APP_KIT} ${LIBOCCA_LIBRARIES})\n+ENDIF()\n+\ntarget_link_libraries(libocca ${LIBOCCA_LIBRARIES} )\ninstall(TARGETS libocca DESTINATION lib )\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[CMake] OS no longer hardcoded. Metal supported on OSX.
|
378,349 |
28.10.2019 08:23:16
| 25,200 |
132ef64a4ddfd6543946444362b1960a473808b1
|
[CMake] Removed OCCA_BINARY_DIR for now, added CMake Travis job
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -73,6 +73,24 @@ matrix:\n- ubuntu-toolchain-r-test\npackages:\n- g++-7\n+ - name: \"gcc-7 (CMake)\"\n+ env:\n+ - CC=gcc-7\n+ - CXX=g++-7\n+ - OCCA_COVERAGE=1\n+ addons:\n+ apt:\n+ sources:\n+ - ubuntu-toolchain-r-test\n+ - cmake\n+ packages:\n+ - g++-7\n+ script:\n+ - cd ${TRAVIS_BUILD_DIR}\n+ - mkdir build\n+ - cd build\n+ - cmake ..\n+ - make -j 4\n- name: \"clang-4.0\"\nenv:\n- CC=clang-4.0\n"
},
{
"change_type": "MODIFY",
"old_path": "CMakeLists.txt",
"new_path": "CMakeLists.txt",
"diff": "@@ -25,7 +25,7 @@ OPTION(ALLOW_OPENMP \"Allow OpenMP\" ON)\nOPTION(ALLOW_OPENCL \"Allow OpenCL\" ON)\nOPTION(ALLOW_METAL \"Allow Metal\" ON)\n-set(PROJ_DIR ${CMAKE_CURRENT_SOURCE_DIR})\n+SET(PROJ_DIR ${CMAKE_CURRENT_SOURCE_DIR})\nlink_directories(${PROJ_DIR}/lib)\n@@ -58,14 +58,14 @@ add_definitions(-DUSE_CMAKE)\ninclude_directories(${PROJ_DIR}/include)\n-set(CMAKE_POSITION_INDEPENDENT_CODE ON)\n+SET(CMAKE_POSITION_INDEPENDENT_CODE ON)\n-set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -Wno-c++11-long-long\")\n-set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-c++11-long-long\")\n-set(CMAKE_EXE_LINKER_FLAGS \"${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}\")\n+SET(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -Wno-c++11-long-long\")\n+SET(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -Wno-c++11-long-long\")\n+SET(CMAKE_EXE_LINKER_FLAGS \"${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}\")\ninclude_directories(${PROJECT_BINARY_DIR})\n-SET(OCCA_BINARY_DIR ${PROJECT_BINARY_DIR} )\n+SET(OCCA_BUILD_DIR ${PROJECT_BINARY_DIR})\n# TODO:\nCONFIGURE_FILE( scripts/compiledDefinesTemplate.hpp.in ${PROJECT_BINARY_DIR}/occa/defines/compiledDefines.hpp )\n# will not work because build directory unknown to runtime compiler\n"
},
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -30,9 +30,9 @@ paths := $(filter-out -L$(OCCA_DIR)/lib,$(paths))\nlinkerFlags := $(filter-out -locca,$(linkerFlags))\nifeq (${PREFIX},)\n- OCCA_BINARY_DIR := $(OCCA_DIR)\n+ OCCA_BUILD_DIR := $(OCCA_DIR)\nelse\n- OCCA_BINARY_DIR := ${PREFIX}\n+ OCCA_BUILD_DIR := ${PREFIX}\nendif\n#=================================================\n@@ -92,7 +92,7 @@ MAKE_COMPILED_DEFINES := $(shell cat \"$(OCCA_DIR)/scripts/compiledDefinesTemplat\ns,@@OCCA_HIP_ENABLED@@,$(OCCA_HIP_ENABLED),g;\\\ns,@@OCCA_OPENCL_ENABLED@@,$(OCCA_OPENCL_ENABLED),g;\\\ns,@@OCCA_METAL_ENABLED@@,$(OCCA_METAL_ENABLED),g;\\\n- s,@@OCCA_BINARY_DIR@@,$(OCCA_BINARY_DIR),g;\"\\\n+ s,@@OCCA_BUILD_DIR@@,$(OCCA_BUILD_DIR),g;\"\\\n> \"$(NEW_COMPILED_DEFINES)\")\nMAKE_COMPILED_DEFINES := $(shell \\\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/env.hpp",
"new_path": "include/occa/tools/env.hpp",
"diff": "@@ -17,7 +17,6 @@ namespace occa {\nextern size_t OCCA_MEM_BYTE_ALIGN;\nextern strVector OCCA_PATH;\nextern bool OCCA_COLOR_ENABLED;\n- extern std::string OCCA_BINARY_DIR;\nproperties& baseSettings();\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/compiledDefinesTemplate.hpp",
"new_path": "scripts/compiledDefinesTemplate.hpp",
"diff": "#define OCCA_OPENCL_ENABLED @@OCCA_OPENCL_ENABLED@@\n#define OCCA_METAL_ENABLED @@OCCA_METAL_ENABLED@@\n-#define OCCA_BINARY_DIR \"@@OCCA_BINARY_DIR@@\"\n+#define OCCA_BUILD_DIR \"@@OCCA_BUILD_DIR@@\"\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/compiledDefinesTemplate.hpp.in",
"new_path": "scripts/compiledDefinesTemplate.hpp.in",
"diff": "#cmakedefine01 OCCA_HIP_ENABLED\n#cmakedefine01 OCCA_METAL_ENABLED\n+#cmakedefine OCCA_BUILD_DIR \"@OCCA_BUILD_DIR@\"\n+\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/serial/device.cpp",
"new_path": "src/modes/serial/device.cpp",
"diff": "@@ -265,14 +265,8 @@ namespace occa {\n<< ' ' << sourceFilename\n<< \" -o \" << binaryFilename\n<< \" -I\" << env::OCCA_DIR << \"include\"\n- << \" -I\" << env::OCCA_DIR << \"include\";\n- if (! env::OCCA_BINARY_DIR.empty() ) {\n- command << \" -I \" << env::OCCA_BINARY_DIR\n- << \" -L \" << env::OCCA_BINARY_DIR << \"/src\";\n- }\n-\n- command << \" -L\" << env::OCCA_DIR << \"lib -locca\";\n- command << std::endl;\n+ << \" -L\" << env::OCCA_DIR << \"lib -locca\"\n+ << std::endl;\n#else\ncommand << kernelProps[\"compiler\"]\n<< \" /D MC_CL_EXE\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/env.cpp",
"new_path": "src/tools/env.cpp",
"diff": "@@ -24,7 +24,6 @@ namespace occa {\nsize_t OCCA_MEM_BYTE_ALIGN;\nstrVector OCCA_PATH;\nbool OCCA_COLOR_ENABLED;\n- std::string OCCA_BINARY_DIR;\nproperties& baseSettings() {\nstatic properties settings_;\n@@ -72,7 +71,6 @@ namespace occa {\nPWD = env::var(\"PWD\");\nPATH = env::var(\"PATH\");\nLD_LIBRARY_PATH = env::var(\"LD_LIBRARY_PATH\");\n- OCCA_BINARY_DIR = env::var(\"OCCA_BINARY_DIR\");\nio::endWithSlash(HOME);\nio::endWithSlash(PWD);\n@@ -81,6 +79,9 @@ namespace occa {\n// OCCA environment variables\nOCCA_DIR = env::var(\"OCCA_DIR\");\n+ if (OCCA_DIR.size() == 0) {\n+ OCCA_DIR = OCCA_BUILD_DIR;\n+ }\nOCCA_COLOR_ENABLED = env::get<bool>(\"OCCA_COLOR_ENABLED\", true);\ninitCachePath();\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[CMake] Removed OCCA_BINARY_DIR for now, added CMake Travis job
|
378,349 |
30.11.2019 00:27:43
| 21,600 |
de598e65036b444bbf700b05e3981b31254144a2
|
[Make] Updates to use C++11
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -13,7 +13,7 @@ compiler: gcc\nenv:\nglobal:\n- LD_LIBRARY_PATH=\"${TRAVIS_BUILD_DIR}/lib:${LD_LIBRARY_PATH}\"\n- - CXXFLAGS=\"-g -O0 -fno-inline\"\n+ - DEBUG=1\nbefore_install:\n- |\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/scripts/shellTools.sh",
"new_path": "include/occa/scripts/shellTools.sh",
"diff": "@@ -361,6 +361,20 @@ function compilerVendor {\nesac\n}\n+function compilerCpp11Flags {\n+ case \"$vendor\" in\n+ GCC|LLVM|INTEL|PGI)\n+ echo \"-std=c++11\";;\n+ CRAY) echo \"-hstd=c++11\" ;;\n+ IBM) echo \"-qlanglvl=extended0x\" ;;\n+ # Unknown\n+ PATHSCALE) echo \"-std=c++11\" ;;\n+ # Unknown\n+ HP) echo \"-std=c++11\" ;;\n+ *) ;;\n+ esac\n+}\n+\nfunction compilerReleaseFlags {\nlocal vendor=$(compilerVendor \"$1\")\n@@ -372,7 +386,7 @@ function compilerReleaseFlags {\nPGI) echo \" -O3 -fast -Mipa=fast,inline -Msmartalloc\" ;;\nPATHSCALE) echo \" -O3 -march=auto\" ;;\nHP) echo \" +O3\" ;;\n- *) echo \"\" ;;\n+ *) ;;\nesac\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/Makefile",
"new_path": "scripts/Makefile",
"diff": "@@ -149,6 +149,7 @@ includeFlagsFor = $(shell . $(OCCA_DIR)/include/occa/scripts/shellTools.sh; head\ncompilerReleaseFlags = $(shell . $(OCCA_DIR)/include/occa/scripts/shellTools.sh; compilerReleaseFlags \"$(compiler)\")\ncompilerDebugFlags = $(shell . $(OCCA_DIR)/include/occa/scripts/shellTools.sh; compilerDebugFlags \"$(compiler)\")\n+compilerCpp11Flags = $(shell . $(OCCA_DIR)/include/occa/scripts/shellTools.sh; compilerCpp11Flags \"$(compiler)\")\ncompilerPicFlag = $(shell . $(OCCA_DIR)/include/occa/scripts/shellTools.sh; compilerPicFlag \"$(compiler)\")\ncompilerSharedFlag = $(shell . $(OCCA_DIR)/include/occa/scripts/shellTools.sh; compilerSharedFlag \"$(compiler)\")\ncompilerPthreadFlag = $(shell . $(OCCA_DIR)/include/occa/scripts/shellTools.sh; compilerPthreadFlag \"$(compiler)\")\n@@ -162,6 +163,7 @@ compilerOpenMPFlag = $(shell . $(OCCA_DIR)/include/occa/scripts/shellTools.s\n#---[ Compiler Info ]-----------------------------\ndebugFlags = $(call compilerDebugFlags)\nreleaseFlags = $(call compilerReleaseFlags)\n+cpp11Flags = $(call compilerCpp11Flags)\npicFlag = $(call compilerPicFlag)\nsharedFlag = $(call compilerSharedFlag)\npthreadFlag = $(call compilerPthreadFlag)\n@@ -271,7 +273,6 @@ ifdef OCCA_HIP_ENABLED\nifeq ($(usingLinux),1)\nlinkerFlags += -lhip_hcc\nendif\n- compilerFlags += -std=c++11\nendif\nelse\nhipIncFlags = $(call includeFlagsFor,hip/hip_runtime_api.h)\n@@ -292,7 +293,6 @@ else\npaths += $(hipconfig)\npaths += $(hipIncFlags)\nlinkerFlags += $(hipLibFlags)\n- compilerFlags += -std=c++11\nendif\nendif\nendif\n@@ -355,6 +355,7 @@ endif\nifeq ($(cudaEnabled),1)\ncompilerFlags += -Wno-c++11-long-long\nendif\n+compilerFlags += $(cpp11Flags)\nifeq ($(checkEnabled),1)\nOCCA_CHECK_ENABLED := 1\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Make] Updates to use C++11
|
378,349 |
30.11.2019 00:28:22
| 21,600 |
c61d636fafd35014aac6f26ef8490c7655c2d6ba
|
[Memory] Adds typed ptr() and use_host_pointer for CPU modes
|
[
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -26,15 +26,13 @@ before_install:\nif [ -n \"${MATRIX_INIT}\" ]; then\neval \"${MATRIX_INIT}\"\nfi\n- export BUILD_CXXFLAGS=\"${CXXFLAGS}\"\n- export TEST_CXXFLAGS=\"${CXXFLAGS}\"\nscript:\n- cd ${TRAVIS_BUILD_DIR}\n- - CXXFLAGS=\"${BUILD_CXXFLAGS}\" make -j 4\n+ - make -j 4\n- cd ${TRAVIS_BUILD_DIR}\n- - CXXFLAGS=\"${TEST_CXXFLAGS}\" make -j 4 test\n+ - make -j 4 test\n- bash <(curl --no-buffer -s https://codecov.io/bash) > codecov_output\n- head -n 100 codecov_output\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/core/base.hpp",
"new_path": "include/occa/core/base.hpp",
"diff": "@@ -112,6 +112,12 @@ namespace occa {\nvoid memcpy(memory dest, memory src,\nconst occa::properties &props);\n+\n+ namespace cpu {\n+ occa::memory wrapMemory(void *ptr,\n+ const udim_t bytes,\n+ const occa::properties &props = occa::properties());\n+ }\n//====================================\n//---[ Free Functions ]---------------\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/core/memory.hpp",
"new_path": "include/occa/core/memory.hpp",
"diff": "@@ -136,11 +136,17 @@ namespace occa {\nmemory& swap(memory &m);\n- void* ptr();\n- const void* ptr() const;\n+ template <class TM = void>\n+ TM* ptr();\n- void* ptr(const occa::properties &props);\n- const void* ptr(const occa::properties &props) const;\n+ template <class TM = void>\n+ const TM* ptr() const;\n+\n+ template <class TM = void>\n+ TM* ptr(const occa::properties &props);\n+\n+ template <class TM = void>\n+ const TM* ptr(const occa::properties &props) const;\nmodeMemory_t* getModeMemory() const;\nmodeDevice_t* getModeDevice() const;\n@@ -243,6 +249,20 @@ namespace occa {\nconst udim_t bytes,\nconst occa::properties &props = occa::properties());\n}\n+\n+ template <>\n+ void* memory::ptr<void>();\n+\n+ template <>\n+ const void* memory::ptr<void>() const;\n+\n+ template <>\n+ void* memory::ptr<void>(const occa::properties &props);\n+\n+ template <>\n+ const void* memory::ptr<void>(const occa::properties &props) const;\n}\n+#include \"memory.tpp\"\n+\n#endif\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "include/occa/core/memory.tpp",
"diff": "+namespace occa {\n+ template <class TM>\n+ TM* memory::ptr() {\n+ return (TM*) ptr<void>();\n+ }\n+\n+ template <class TM>\n+ const TM* memory::ptr() const {\n+ return (const TM*) ptr<void>();\n+ }\n+\n+ template <class TM>\n+ TM* memory::ptr(const occa::properties &props) {\n+ return (TM*) ptr<void>(props);\n+ }\n+\n+ template <class TM>\n+ const TM* memory::ptr(const occa::properties &props) const {\n+ return (const TM*) ptr<void>(props);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/c/memory.cpp",
"new_path": "src/c/memory.cpp",
"diff": "@@ -161,18 +161,25 @@ occaMemory OCCA_RFUNC occaWrapCpuMemory(occaDevice device,\nvoid *ptr,\noccaUDim_t bytes,\noccaProperties props) {\n+ occa::device device_ = (\n+ occa::c::isDefault(device)\n+ ? occa::getDevice()\n+ : occa::c::device(device)\n+ );\n+\nocca::memory mem;\nif (occa::c::isDefault(props)) {\n- mem = occa::cpu::wrapMemory(occa::c::device(device),\n+ mem = occa::cpu::wrapMemory(device_,\nptr,\nbytes);\n} else {\n- mem = occa::cpu::wrapMemory(occa::c::device(device),\n+ mem = occa::cpu::wrapMemory(device_,\nptr,\nbytes,\nocca::c::properties(props));\n}\nmem.dontUseRefs();\n+\nreturn occa::c::newOccaType(mem);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/base.cpp",
"new_path": "src/core/base.cpp",
"diff": "@@ -207,6 +207,14 @@ namespace occa {\nconst occa::properties &props) {\nmemcpy(dest, src, -1, 0, 0, props);\n}\n+\n+ namespace cpu {\n+ occa::memory wrapMemory(void *ptr,\n+ const udim_t bytes,\n+ const occa::properties &props) {\n+ return occa::cpu::wrapMemory(getDevice(), ptr, bytes, props);\n+ }\n+ }\n//====================================\n//---[ Free Functions ]---------------\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/memory.cpp",
"new_path": "src/core/memory.cpp",
"diff": "@@ -143,25 +143,29 @@ namespace occa {\nreturn *this;\n}\n- void* memory::ptr() {\n+ template <>\n+ void* memory::ptr<void>() {\nreturn (modeMemory\n? modeMemory->ptr\n: NULL);\n}\n- const void* memory::ptr() const {\n+ template <>\n+ const void* memory::ptr<void>() const {\nreturn (modeMemory\n? modeMemory->ptr\n: NULL);\n}\n- void* memory::ptr(const occa::properties &props) {\n+ template <>\n+ void* memory::ptr<void>(const occa::properties &props) {\nreturn (modeMemory\n? modeMemory->getPtr(props)\n: NULL);\n}\n- const void* memory::ptr(const occa::properties &props) const {\n+ template <>\n+ const void* memory::ptr<void>(const occa::properties &props) const {\nreturn (modeMemory\n? modeMemory->getPtr(props)\n: NULL);\n@@ -594,15 +598,10 @@ namespace occa {\nvoid *ptr,\nconst udim_t bytes,\nconst occa::properties &props) {\n- serial::memory &mem = *(new serial::memory(device.getModeDevice(),\n- bytes,\n- props));\n+ occa::properties memProps = props;\n+ memProps[\"use_host_pointer\"] = true;\n- mem.dontUseRefs();\n- mem.ptr = (char*) ptr;\n- mem.isOrigin = false;\n-\n- return occa::memory(&mem);\n+ return device.malloc(bytes, ptr, memProps);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/serial/device.cpp",
"new_path": "src/modes/serial/device.cpp",
"diff": "@@ -353,10 +353,15 @@ namespace occa {\nconst occa::properties &props) {\nmemory *mem = new memory(this, bytes, props);\n+ if (props.get(\"use_host_pointer\", false)) {\n+ mem->ptr = (char*) const_cast<void*>(src);\n+ mem->isOrigin = false;\n+ } else {\nmem->ptr = (char*) sys::malloc(bytes);\nif (src) {\n::memcpy(mem->ptr, src, bytes);\n}\n+ }\nreturn mem;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/src/c/memory.cpp",
"new_path": "tests/src/c/memory.cpp",
"diff": "@@ -256,13 +256,25 @@ void testInteropMethods() {\nbytes,\noccaDefault);\n+ mem2 = occaWrapCpuMemory(occaDefault,\n+ ptr,\n+ bytes,\n+ occaDefault);\n+\noccaProperties props = (\noccaCreatePropertiesFromString(\"foo: 'bar'\")\n);\n+\nmem2 = occaWrapCpuMemory(occaHost(),\nptr,\nbytes,\nprops);\n+\n+ mem2 = occaWrapCpuMemory(occaDefault,\n+ ptr,\n+ bytes,\n+ props);\n+\noccaFree(mem1);\noccaFree(mem2);\noccaFree(props);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/src/core/memory.cpp",
"diff": "+#include <occa.hpp>\n+#include <occa/tools/testing.hpp>\n+\n+void testMalloc();\n+void testCpuWrapMemory();\n+\n+int main(const int argc, const char **argv) {\n+ testMalloc();\n+ testCpuWrapMemory();\n+\n+ return 0;\n+}\n+\n+void testMalloc() {\n+ const occa::udim_t bytes = 1 * sizeof(int);\n+ int value = 4660;\n+ int *hostPtr = &value;\n+\n+ occa::memory mem = occa::malloc(bytes);\n+\n+ mem = occa::malloc(bytes, hostPtr);\n+ ASSERT_EQ(((int*) mem.ptr())[0], value);\n+ ASSERT_NEQ(mem.ptr<int>(), hostPtr);\n+\n+ mem = occa::malloc(bytes, hostPtr, \"use_host_pointer: true\");\n+ ASSERT_EQ(mem.ptr<int>()[0], value);\n+ ASSERT_EQ(mem.ptr<int>(), hostPtr);\n+}\n+\n+void testCpuWrapMemory() {\n+ const occa::udim_t bytes = 1 * sizeof(int);\n+ int value = 4660;\n+ int *hostPtr = &value;\n+\n+ occa::memory mem = occa::cpu::wrapMemory(hostPtr, bytes);\n+ ASSERT_EQ(mem.ptr<int>()[0], value);\n+ ASSERT_EQ(mem.ptr<int>(), hostPtr);\n+\n+ mem = occa::cpu::wrapMemory(hostPtr, bytes, \"use_host_pointer: false\");\n+ ASSERT_EQ(mem.ptr<int>()[0], value);\n+ ASSERT_EQ(mem.ptr<int>(), hostPtr);\n+}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Memory] Adds typed ptr() and use_host_pointer for CPU modes
|
378,349 |
30.11.2019 02:55:08
| 21,600 |
591b5bb889fad71d648552c648d37349601b7d23
|
[Make] Fixed C++11 compiler flags
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/scripts/shellTools.sh",
"new_path": "include/occa/scripts/shellTools.sh",
"diff": "@@ -362,6 +362,8 @@ function compilerVendor {\n}\nfunction compilerCpp11Flags {\n+ local vendor=$(compilerVendor \"$1\")\n+\ncase \"$vendor\" in\nGCC|LLVM|INTEL|PGI)\necho \"-std=c++11\";;\n"
},
{
"change_type": "MODIFY",
"old_path": "scripts/Makefile",
"new_path": "scripts/Makefile",
"diff": "@@ -22,7 +22,6 @@ testPath = $(PROJ_DIR)/tests\ndebugEnabled = 0\ncheckEnabled = 1\n-ifdef OCCA_DEVELOPER\nifeq ($(OCCA_DEVELOPER),1)\nifeq ($(DEBUG),0)\ndebugEnabled = 0\n@@ -36,7 +35,6 @@ ifdef OCCA_DEVELOPER\ndebugEnabled = 0\nendif\nendif\n-endif\nflags =\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Make] Fixed C++11 compiler flags
|
378,349 |
30.11.2019 01:39:12
| 21,600 |
f813c34bd1846c2250a7e5375c177bc16bb4c208
|
[Core] Adds templated malloc
|
[
{
"change_type": "MODIFY",
"old_path": "examples/cpp/01_add_vectors/main.cpp",
"new_path": "examples/cpp/01_add_vectors/main.cpp",
"diff": "@@ -46,7 +46,7 @@ int main(int argc, const char **argv) {\n// Allocate memory on the device\no_a = device.malloc(entries, occa::dtype::float_);\n// Primitive types are available by template\n- o_b = device.malloc(entries, occa::dtype::get<float>());\n+ o_b = device.malloc<float>(entries);\n// We can also allocate memory without a dtype\n// WARNING: This will disable runtime type checking\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/core/base.hpp",
"new_path": "include/occa/core/base.hpp",
"diff": "@@ -65,9 +65,12 @@ namespace occa {\nconst void *src = NULL,\nconst occa::properties &props = occa::properties());\n- occa::memory malloc(const dim_t bytes,\n+ template <class TM = void>\n+ occa::memory malloc(const dim_t entries,\nconst void *src = NULL,\n- const occa::properties &props = occa::properties());\n+ const occa::properties &props = occa::properties()) {\n+ return malloc(entries, dtype::get<TM>(), src, props);\n+ }\nvoid* umalloc(const dim_t entries,\nconst dtype_t &dtype,\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/core/device.hpp",
"new_path": "include/occa/core/device.hpp",
"diff": "@@ -247,14 +247,17 @@ namespace occa {\nconst dtype_t &dtype,\nconst occa::properties &props);\n+ template <class TM = void>\nocca::memory malloc(const dim_t bytes,\nconst void *src = NULL,\nconst occa::properties &props = occa::properties());\n+ template <class TM = void>\nocca::memory malloc(const dim_t bytes,\nconst occa::memory src,\nconst occa::properties &props = occa::properties());\n+ template <class TM = void>\nocca::memory malloc(const dim_t bytes,\nconst occa::properties &props);\n@@ -272,25 +275,19 @@ namespace occa {\nconst dtype_t &dtype,\nconst occa::properties &props);\n- template <class TM>\n+ template <class TM = void>\nTM* umalloc(const dim_t entries,\nconst void *src = NULL,\n- const occa::properties &props = occa::properties()) {\n- return (TM*) umalloc(entries, dtype::get<TM>(), src, props);\n- }\n+ const occa::properties &props = occa::properties());\n- template <class TM>\n+ template <class TM = void>\nTM* umalloc(const dim_t entries,\nconst occa::memory src,\n- const occa::properties &props = occa::properties()) {\n- return (TM*) umalloc(entries, dtype::get<TM>(), src, props);\n- }\n+ const occa::properties &props = occa::properties());\n- template <class TM>\n+ template <class TM = void>\nTM* umalloc(const dim_t entries,\n- const occa::properties &props) {\n- return (TM*) umalloc(entries, dtype::get<TM>(), props);\n- }\n+ const occa::properties &props);\n// |===============================\n};\n@@ -299,7 +296,23 @@ namespace occa {\nstd::ostream& operator << (std::ostream &out,\nconst occa::device &device);\n+\n+ template <>\n+ occa::memory device::malloc<void>(const dim_t entries,\n+ const void *src,\n+ const occa::properties &props);\n+\n+ template <>\n+ occa::memory device::malloc<void>(const dim_t entries,\n+ const occa::memory src,\n+ const occa::properties &props);\n+\n+ template <>\n+ occa::memory device::malloc<void>(const dim_t entries,\n+ const occa::properties &props);\n//====================================\n}\n+#include \"device.tpp\"\n+\n#endif\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "include/occa/core/device.tpp",
"diff": "+namespace occa {\n+ template <class TM>\n+ occa::memory device::malloc(const dim_t entries,\n+ const void *src,\n+ const occa::properties &props) {\n+ return malloc(entries, occa::dtype::get<TM>(), src, props);\n+ }\n+\n+ template <class TM>\n+ occa::memory device::malloc(const dim_t entries,\n+ const occa::memory src,\n+ const occa::properties &props) {\n+ return malloc(entries, occa::dtype::get<TM>(), src, props);\n+ }\n+\n+ template <class TM>\n+ occa::memory device::malloc(const dim_t entries,\n+ const occa::properties &props) {\n+ return malloc(entries, occa::dtype::get<TM>(), props);\n+ }\n+\n+ template <class TM>\n+ TM* device::umalloc(const dim_t entries,\n+ const void *src,\n+ const occa::properties &props) {\n+ return (TM*) umalloc(entries, dtype::get<TM>(), src, props);\n+ }\n+\n+ template <class TM>\n+ TM* device::umalloc(const dim_t entries,\n+ const occa::memory src,\n+ const occa::properties &props) {\n+ return (TM*) umalloc(entries, dtype::get<TM>(), src, props);\n+ }\n+\n+ template <class TM>\n+ TM* device::umalloc(const dim_t entries,\n+ const occa::properties &props) {\n+ return (TM*) umalloc(entries, dtype::get<TM>(), props);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/base.cpp",
"new_path": "src/core/base.cpp",
"diff": "@@ -102,12 +102,6 @@ namespace occa {\nreturn getDevice().malloc(entries, dtype, src, props);\n}\n- occa::memory malloc(const dim_t bytes,\n- const void *src,\n- const occa::properties &props) {\n- return getDevice().malloc(bytes, src, props);\n- }\n-\nvoid* umalloc(const dim_t entries,\nconst dtype_t &dtype,\nconst void *src,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/device.cpp",
"new_path": "src/core/device.cpp",
"diff": "@@ -610,21 +610,24 @@ namespace occa {\nreturn malloc(entries, dtype, NULL, props);\n}\n- memory device::malloc(const dim_t bytes,\n+ template <>\n+ memory device::malloc<void>(const dim_t entries,\nconst void *src,\nconst occa::properties &props) {\n- return malloc(bytes, dtype::byte, src, props);\n+ return malloc(entries, dtype::byte, src, props);\n}\n- memory device::malloc(const dim_t bytes,\n+ template <>\n+ memory device::malloc<void>(const dim_t entries,\nconst occa::memory src,\nconst occa::properties &props) {\n- return malloc(bytes, dtype::byte, src, props);\n+ return malloc(entries, dtype::byte, src, props);\n}\n- memory device::malloc(const dim_t bytes,\n+ template <>\n+ memory device::malloc<void>(const dim_t entries,\nconst occa::properties &props) {\n- return malloc(bytes, dtype::byte, NULL, props);\n+ return malloc(entries, dtype::byte, NULL, props);\n}\nvoid* device::umalloc(const dim_t entries,\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Core] Adds templated malloc
|
378,349 |
30.11.2019 13:44:51
| 21,600 |
42a605ddb8d728dcd7e42461e57dc764d55ef4d0
|
[Valgrind] Removed bad access to json.initialized
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/json.hpp",
"new_path": "include/occa/tools/json.hpp",
"diff": "@@ -231,7 +231,7 @@ namespace occa {\nreturn *this;\n}\n- virtual bool isInitialized();\n+ virtual bool isInitialized() const;\njson& load(const char *&c);\njson& load(const std::string &s);\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/properties.hpp",
"new_path": "include/occa/tools/properties.hpp",
"diff": "namespace occa {\nclass properties: public json {\npublic:\n- bool initialized;\n+ // Note: Do not use directly since we're casting between\n+ // occa::json& <--> occa::properties&\n+ mutable bool initialized;\nproperties();\nproperties(const properties &other);\n@@ -15,19 +17,19 @@ namespace occa {\nproperties(const std::string &s);\n~properties();\n- bool isInitialized();\n+ bool isInitialized() const;\nvoid load(const char *&c);\nvoid load(const std::string &s);\nstatic properties read(const std::string &filename);\n+ };\n- inline properties operator + (const properties &p) const {\n- properties ret = *this;\n- ret.mergeWithObject(p.value_.object);\n- return ret;\n+ inline properties operator + (const properties &left, const properties &right) {\n+ properties sum = left;\n+ sum.mergeWithObject(right.value_.object);\n+ return sum;\n}\n- };\ntemplate <>\nhash_t hash(const properties &props);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/json.cpp",
"new_path": "src/tools/json.cpp",
"diff": "@@ -25,7 +25,7 @@ namespace occa {\nreturn *this;\n}\n- bool json::isInitialized() {\n+ bool json::isInitialized() const {\nreturn (type != none_);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/properties.cpp",
"new_path": "src/tools/properties.cpp",
"diff": "@@ -11,7 +11,9 @@ namespace occa {\nproperties::properties(const properties &other) {\ntype = object_;\nvalue_ = other.value_;\n- initialized = other.initialized;\n+\n+ // Note: \"other\" might be a json object\n+ initialized = other.isInitialized();\n}\nproperties::properties(const json &j) {\n@@ -20,17 +22,19 @@ namespace occa {\ninitialized = true;\n}\n- properties::properties(const char *c) {\n+ properties::properties(const char *c) :\n+ initialized(false) {\nproperties::load(c);\n}\n- properties::properties(const std::string &s) {\n+ properties::properties(const std::string &s) :\n+ initialized(false) {\nproperties::load(s);\n}\nproperties::~properties() {}\n- bool properties::isInitialized() {\n+ bool properties::isInitialized() const {\nif (!initialized) {\ninitialized = value_.object.size();\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Valgrind] Removed bad access to json.initialized
|
378,349 |
30.11.2019 15:02:21
| 21,600 |
6e7fc30bb5ec28d2fb83aceb02d3f1d82c6c433f
|
[Memory] Adds own_host_pointer flag to malloc and wrapMemory
|
[
{
"change_type": "MODIFY",
"old_path": "src/core/memory.cpp",
"new_path": "src/core/memory.cpp",
"diff": "@@ -598,10 +598,12 @@ namespace occa {\nvoid *ptr,\nconst udim_t bytes,\nconst occa::properties &props) {\n- occa::properties memProps = props;\n- memProps[\"use_host_pointer\"] = true;\n+ static occa::properties defaultProps(\n+ \"use_host_pointer: true,\"\n+ \"own_host_pointer: false\"\n+ );\n- return device.malloc(bytes, ptr, memProps);\n+ return device.malloc(bytes, ptr, defaultProps + props);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/serial/device.cpp",
"new_path": "src/modes/serial/device.cpp",
"diff": "@@ -355,7 +355,7 @@ namespace occa {\nif (props.get(\"use_host_pointer\", false)) {\nmem->ptr = (char*) const_cast<void*>(src);\n- mem->isOrigin = false;\n+ mem->isOrigin = props.get(\"own_host_pointer\", false);\n} else {\nmem->ptr = (char*) sys::malloc(bytes);\nif (src) {\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Memory] Adds own_host_pointer flag to malloc and wrapMemory
|
378,349 |
01.12.2019 20:23:15
| 21,600 |
268369ce87f0b551b08da16218f90d970a944163
|
[BG] Fixes <void> templated malloc
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/core/base.hpp",
"new_path": "include/occa/core/base.hpp",
"diff": "@@ -68,21 +68,27 @@ namespace occa {\ntemplate <class TM = void>\nocca::memory malloc(const dim_t entries,\nconst void *src = NULL,\n- const occa::properties &props = occa::properties()) {\n- return malloc(entries, dtype::get<TM>(), src, props);\n- }\n+ const occa::properties &props = occa::properties());\n+\n+ template <>\n+ occa::memory malloc<void>(const dim_t entries,\n+ const void *src,\n+ const occa::properties &props);\nvoid* umalloc(const dim_t entries,\nconst dtype_t &dtype,\nconst void *src = NULL,\nconst occa::properties &props = occa::properties());\n- template <class TM>\n- TM* umalloc(const dim_t bytes,\n+ template <class TM = void>\n+ TM* umalloc(const dim_t entries,\nconst void *src = NULL,\n- const occa::properties &props = occa::properties()) {\n- return (TM*) umalloc(bytes, dtype::get<TM>(), src, props);\n- }\n+ const occa::properties &props = occa::properties());\n+\n+ template <>\n+ void* umalloc<void>(const dim_t entries,\n+ const void *src,\n+ const occa::properties &props);\nvoid memcpy(void *dest, const void *src,\nconst dim_t bytes,\n@@ -133,4 +139,6 @@ namespace occa {\nvoid printModeInfo();\n}\n+#include \"base.tpp\"\n+\n#endif\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "include/occa/core/base.tpp",
"diff": "+namespace occa {\n+ template <class TM>\n+ occa::memory malloc(const dim_t entries,\n+ const void *src,\n+ const occa::properties &props) {\n+ return malloc(entries, dtype::get<TM>(), src, props);\n+ }\n+\n+ template <class TM>\n+ TM* umalloc(const dim_t entries,\n+ const void *src,\n+ const occa::properties &props) {\n+ return (TM*) umalloc(entries, dtype::get<TM>(), src, props);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/base.cpp",
"new_path": "src/core/base.cpp",
"diff": "@@ -102,6 +102,13 @@ namespace occa {\nreturn getDevice().malloc(entries, dtype, src, props);\n}\n+ template <>\n+ occa::memory malloc<void>(const dim_t entries,\n+ const void *src,\n+ const occa::properties &props) {\n+ return getDevice().malloc(entries, dtype::byte, src, props);\n+ }\n+\nvoid* umalloc(const dim_t entries,\nconst dtype_t &dtype,\nconst void *src,\n@@ -109,6 +116,13 @@ namespace occa {\nreturn getDevice().umalloc(entries, dtype, src, props);\n}\n+ template <>\n+ void* umalloc<void>(const dim_t entries,\n+ const void *src,\n+ const occa::properties &props) {\n+ return getDevice().umalloc(entries, dtype::byte, src, props);\n+ }\n+\nvoid memcpy(void *dest, const void *src,\nconst dim_t bytes,\nconst occa::properties &props) {\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/src/core/memory.cpp",
"new_path": "tests/src/core/memory.cpp",
"diff": "@@ -25,6 +25,21 @@ void testMalloc() {\nmem = occa::malloc(bytes, hostPtr, \"use_host_pointer: true\");\nASSERT_EQ(mem.ptr<int>()[0], value);\nASSERT_EQ(mem.ptr<int>(), hostPtr);\n+\n+ occa::setDevice(\n+ \"mode: 'Serial',\"\n+ \"memory: {\"\n+ \" use_host_pointer: true,\"\n+ \"}\"\n+ );\n+\n+ mem = occa::malloc(bytes, hostPtr);\n+ ASSERT_EQ(((int*) mem.ptr())[0], value);\n+ ASSERT_EQ(mem.ptr<int>(), hostPtr);\n+\n+ mem = occa::malloc(bytes, hostPtr, \"use_host_pointer: false\");\n+ ASSERT_EQ(mem.ptr<int>()[0], value);\n+ ASSERT_NEQ(mem.ptr<int>(), hostPtr);\n}\nvoid testCpuWrapMemory() {\n@@ -38,5 +53,5 @@ void testCpuWrapMemory() {\nmem = occa::cpu::wrapMemory(hostPtr, bytes, \"use_host_pointer: false\");\nASSERT_EQ(mem.ptr<int>()[0], value);\n- ASSERT_EQ(mem.ptr<int>(), hostPtr);\n+ ASSERT_NEQ(mem.ptr<int>(), hostPtr);\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[BG] Fixes <void> templated malloc
|
378,349 |
03.12.2019 12:29:49
| 18,000 |
1a58917699eecac2d72b45ccf090e8b0a6f68b8b
|
[Serial] Fixes lack of C++11 flags when compiling kernels
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/tools.hpp",
"new_path": "include/occa/tools.hpp",
"diff": "#include <occa/tools/sys.hpp>\n#include <occa/tools/tls.hpp>\n#include <occa/tools/uva.hpp>\n+#include <occa/tools/vector.hpp>\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/string.hpp",
"new_path": "include/occa/tools/string.hpp",
"diff": "@@ -238,14 +238,10 @@ namespace occa {\n}\nstd::string stringifyBytes(udim_t bytes);\n+\nvoid stringifyBytesFraction(std::stringstream &ss,\nuint64_t fraction);\n- //---[ Vector Methods ]---------------\n- std::string join(const strVector &vec,\n- const std::string &seq);\n- //====================================\n-\n//---[ Color Strings ]----------------\nnamespace color {\nenum color_t {\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/sys.hpp",
"new_path": "include/occa/tools/sys.hpp",
"diff": "@@ -79,11 +79,19 @@ namespace occa {\nint compilerVendor(const std::string &compiler);\n+ std::string compilerCpp11Flags(const std::string &compiler);\n+ std::string compilerCpp11Flags(const int vendor_);\n+\n+ void addCpp11Flags(const std::string &compiler, std::string &compilerFlags);\n+ void addCpp11Flags(const int vendor_, std::string &compilerFlags);\n+\nstd::string compilerSharedBinaryFlags(const std::string &compiler);\nstd::string compilerSharedBinaryFlags(const int vendor_);\n- void addSharedBinaryFlagsTo(const std::string &compiler, std::string &compilerFlags);\n- void addSharedBinaryFlagsTo(const int vendor_, std::string &compilerFlags);\n+ void addSharedBinaryFlags(const std::string &compiler, std::string &compilerFlags);\n+ void addSharedBinaryFlags(const int vendor_, std::string &compilerFlags);\n+\n+ void addCompilerFlags(std::string &compilerFlags, const std::string &flags);\n//==================================\n//---[ Dynamic Methods ]------------\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "include/occa/tools/vector.hpp",
"diff": "+#ifndef OCCA_TOOLS_VECTOR_HEADER\n+#define OCCA_TOOLS_VECTOR_HEADER\n+\n+#include <string>\n+#include <vector>\n+\n+#include <occa/types/typedefs.hpp>\n+\n+namespace occa {\n+ template <class TM>\n+ dim_t indexOf(const std::vector<TM> &vec,\n+ const TM &value) {\n+ const dim_t size = vec.size();\n+ for (dim_t i = 0; i < size; ++i) {\n+ if (vec[i] == value) {\n+ return i;\n+ }\n+ }\n+ return -1;\n+ }\n+\n+ std::string join(const std::vector<std::string> &vec,\n+ const std::string &delimiter);\n+}\n+\n+#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/serial/device.cpp",
"new_path": "src/modes/serial/device.cpp",
"diff": "@@ -256,8 +256,10 @@ namespace occa {\n}\nstd::string compilerFlags = kernelProps[\"compiler_flags\"];\n- sys::addSharedBinaryFlagsTo((int) kernelProps[\"vendor\"],\n- compilerFlags);\n+ const int vendor = (int) kernelProps[\"vendor\"];\n+\n+ sys::addSharedBinaryFlags(vendor, compilerFlags);\n+ sys::addCpp11Flags(vendor, compilerFlags);\n#if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))\ncommand << (std::string) kernelProps[\"compiler\"]\n@@ -281,7 +283,7 @@ namespace occa {\n<< std::endl;\n#endif\n- const std::string &sCommand = command.str();\n+ const std::string &sCommand = strip(command.str());\nif (verbose) {\nio::stdout << \"Compiling [\" << kernelName << \"]\\n\" << sCommand << \"\\n\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/string.cpp",
"new_path": "src/tools/string.cpp",
"diff": "@@ -342,22 +342,6 @@ namespace occa {\n}\n}\n- //---[ Vector Methods ]---------------\n- std::string join(const strVector &vec,\n- const std::string &seq) {\n- const int entries = (int) vec.size();\n- if (entries == 0) {\n- return \"\";\n- }\n- std::string ret = vec[0];\n- for (int i = 1; i < entries; ++i) {\n- ret += seq;\n- ret += vec[i];\n- }\n- return ret;\n- }\n- //====================================\n-\n//---[ Color Strings ]----------------\nnamespace color {\nconst char fgMap[9][7] = {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/tools/sys.cpp",
"new_path": "src/tools/sys.cpp",
"diff": "#include <occa/tools/misc.hpp>\n#include <occa/tools/string.hpp>\n#include <occa/tools/sys.hpp>\n+#include <occa/tools/vector.hpp>\nnamespace occa {\nnamespace sys {\n@@ -701,6 +702,40 @@ namespace occa {\n#endif\n}\n+ std::string compilerCpp11Flags(const std::string &compiler) {\n+ return compilerCpp11Flags( sys::compilerVendor(compiler) );\n+ }\n+\n+ std::string compilerCpp11Flags(const int vendor_) {\n+ if (vendor_ & (sys::vendor::GNU |\n+ sys::vendor::LLVM |\n+ sys::vendor::Intel |\n+ sys::vendor::HP |\n+ sys::vendor::PGI |\n+ sys::vendor::Pathscale)) {\n+ return \"-std=c++11\";\n+ } else if (vendor_ & sys::vendor::Cray) {\n+ return \"-hstd=c++11\";\n+ } else if (vendor_ & sys::vendor::IBM) {\n+ return \"-qlanglvl=extended0x\";\n+ } else if (vendor_ & sys::vendor::VisualStudio) {\n+ return \"\"; // Defaults to C++14\n+ }\n+ OCCA_FORCE_ERROR(\"Could not find C++11 compiler flags\");\n+ return \"\";\n+ }\n+\n+ void addCpp11Flags(const std::string &compiler, std::string &compilerFlags) {\n+ addCpp11Flags(sys::compilerVendor(compiler), compilerFlags);\n+ }\n+\n+ void addCpp11Flags(const int vendor_, std::string &compilerFlags) {\n+ addCompilerFlags(\n+ compilerFlags,\n+ sys::compilerCpp11Flags(vendor_)\n+ );\n+ }\n+\nstd::string compilerSharedBinaryFlags(const std::string &compiler) {\nreturn compilerSharedBinaryFlags( sys::compilerVendor(compiler) );\n}\n@@ -724,37 +759,29 @@ namespace occa {\nreturn \"\";\n}\n- void addSharedBinaryFlagsTo(const std::string &compiler, std::string &compilerFlags) {\n- addSharedBinaryFlagsTo(sys::compilerVendor(compiler), compilerFlags);\n+ void addSharedBinaryFlags(const std::string &compiler, std::string &compilerFlags) {\n+ addSharedBinaryFlags(sys::compilerVendor(compiler), compilerFlags);\n}\n- void addSharedBinaryFlagsTo(const int vendor_, std::string &compilerFlags) {\n- strVector flags = split(compilerFlags, ' ');\n- const int flagCount = (int) flags.size();\n+ void addSharedBinaryFlags(const int vendor_, std::string &compilerFlags) {\n+ addCompilerFlags(\n+ compilerFlags,\n+ sys::compilerSharedBinaryFlags(vendor_)\n+ );\n+ }\n- strVector sharedFlags = split(sys::compilerSharedBinaryFlags(vendor_), ' ');\n- const int sharedFlagCount = (int) sharedFlags.size();\n+ void addCompilerFlags(std::string &compilerFlags, const std::string &flags) {\n+ strVector compilerFlagsVec = split(compilerFlags, ' ');\n+ const strVector flagsVec = split(flags, ' ');\n- for (int sfi = 0; sfi < sharedFlagCount; ++sfi) {\n- const std::string &sharedFlag = sharedFlags[sfi];\n- // Check existing flags, avoid counting the new shared flags\n- for (int fi = 0; fi < flagCount; ++fi) {\n- const std::string &flag = flags[fi];\n- if (sharedFlag == flag) {\n- break;\n- }\n- // Flag not found since this is the last flag\n- if (fi == (flagCount - 1)) {\n- flags.push_back(sharedFlag);\n- }\n+ for (int i = 0; i < (int) flagsVec.size(); ++i) {\n+ const std::string &flag = flagsVec[i];\n+ if (indexOf(compilerFlagsVec, flag) < 0) {\n+ compilerFlagsVec.push_back(flag);\n}\n}\n- // Add new flags\n- for (int i = flagCount; i < (int) flags.size(); ++i) {\n- compilerFlags += ' ';\n- compilerFlags += flags[i];\n- }\n+ compilerFlags = join(compilerFlagsVec, \" \");\n}\n//---[ Dynamic Methods ]------------\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/tools/vector.cpp",
"diff": "+#include <occa/tools/string.hpp>\n+#include <occa/tools/vector.hpp>\n+\n+namespace occa {\n+ std::string join(const std::vector<std::string> &vec,\n+ const std::string &delimiter) {\n+ const size_t size = vec.size();\n+ std::string ret;\n+ for (size_t i = 0; i < size; ++i) {\n+ if (i) {\n+ ret += delimiter;\n+ }\n+ ret += toString(vec[i]);\n+ }\n+ return ret;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/src/tools/vector.cpp",
"diff": "+#include <occa.hpp>\n+#include <occa/tools/testing.hpp>\n+\n+using namespace occa;\n+\n+template <class TM>\n+TM castNum(const int i) {\n+ return fromString<TM>(\n+ toString(i)\n+ );\n+}\n+\n+template <class TM>\n+void testIndexOf() {\n+ std::vector<TM> vec;\n+ for (int i = 0; i < 10; ++i) {\n+ vec.push_back(castNum<TM>(i));\n+ }\n+\n+ ASSERT_EQ(\n+ (dim_t) 5,\n+ indexOf(vec, castNum<TM>(5))\n+ );\n+\n+ ASSERT_EQ(\n+ (dim_t) -1,\n+ indexOf(vec, castNum<TM>(-1))\n+ );\n+\n+ ASSERT_EQ(\n+ (dim_t) -1,\n+ indexOf(vec, castNum<TM>(11))\n+ );\n+}\n+\n+void testJoin();\n+\n+int main(const int argc, const char **argv) {\n+ testIndexOf<int>();\n+ testIndexOf<float>();\n+ testIndexOf<std::string>();\n+ testJoin();\n+\n+ return 0;\n+}\n+\n+void testJoin() {\n+ strVector vec;\n+ vec.push_back(\"a\");\n+ vec.push_back(\"b\");\n+ vec.push_back(\"c\");\n+ ASSERT_EQ(join(vec, \",\"),\n+ \"a,b,c\");\n+ ASSERT_EQ(join(vec, \" , \"),\n+ \"a , b , c\");\n+}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Serial] Fixes lack of C++11 flags when compiling kernels
|
378,349 |
04.12.2019 18:54:53
| 18,000 |
aea235804c2a55800600dc6a9f532de46b80e26c
|
[Env] Fixed missing slash in cache dir
|
[
{
"change_type": "MODIFY",
"old_path": "src/tools/env.cpp",
"new_path": "src/tools/env.cpp",
"diff": "@@ -141,6 +141,7 @@ namespace occa {\nenv::OCCA_CACHE_DIR = ss.str();\n}\nenv::OCCA_CACHE_DIR = io::filename(env::OCCA_CACHE_DIR);\n+ io::endWithSlash(env::OCCA_CACHE_DIR);\nif (!io::isDir(env::OCCA_CACHE_DIR)) {\nsys::mkpath(env::OCCA_CACHE_DIR);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Env] Fixed missing slash in cache dir
|
378,349 |
06.12.2019 23:04:43
| 18,000 |
323372b4e404a58afb0046a23b0c51066d9960b6
|
[Kernel] Adds initialization check on kernel call
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/setup_kernel_operators.py",
"new_path": "scripts/setup_kernel_operators.py",
"diff": "@@ -119,6 +119,7 @@ def operator_definition(N):\ncontent += operator_args(N, indent, 'const kernelArg &')\nif N > 0:\ncontent += ''') const {{\n+ assertInitialized();\nkernelArg args[] = {{\n{array_args}\n}};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/kernelOperators.cpp",
"new_path": "src/core/kernelOperators.cpp",
"diff": "@@ -9,6 +9,7 @@ void kernel::operator() () const {\n}\nvoid kernel::operator() (const kernelArg &arg1) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1\n};\n@@ -17,6 +18,7 @@ void kernel::operator() (const kernelArg &arg1) const {\n}\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2\n};\n@@ -25,6 +27,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2) const {\n}\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3\n};\n@@ -33,6 +36,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\n}\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4\n};\n@@ -41,6 +45,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\n}\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5\n};\n@@ -50,6 +55,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5,\nconst kernelArg &arg6) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6\n};\n@@ -59,6 +65,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5,\nconst kernelArg &arg6, const kernelArg &arg7) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7\n};\n@@ -68,6 +75,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5,\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8\n};\n@@ -77,6 +85,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5,\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9\n};\n@@ -86,6 +95,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5,\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10\n};\n@@ -96,6 +106,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5,\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10,\nconst kernelArg &arg11) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11\n@@ -107,6 +118,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5,\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10,\nconst kernelArg &arg11, const kernelArg &arg12) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12\n@@ -118,6 +130,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5,\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10,\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13\n@@ -129,6 +142,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5,\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10,\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14\n@@ -140,6 +154,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nvoid kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const kernelArg &arg3, const kernelArg &arg4, const kernelArg &arg5,\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10,\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15\n@@ -152,6 +167,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10,\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15,\nconst kernelArg &arg16) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16\n@@ -164,6 +180,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10,\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15,\nconst kernelArg &arg16, const kernelArg &arg17) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17\n@@ -176,6 +193,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10,\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15,\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18\n@@ -188,6 +206,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10,\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15,\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19\n@@ -200,6 +219,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg6, const kernelArg &arg7, const kernelArg &arg8, const kernelArg &arg9, const kernelArg &arg10,\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15,\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20\n@@ -213,6 +233,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15,\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20,\nconst kernelArg &arg21) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -227,6 +248,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15,\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20,\nconst kernelArg &arg21, const kernelArg &arg22) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -241,6 +263,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15,\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20,\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -255,6 +278,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15,\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20,\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -269,6 +293,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg11, const kernelArg &arg12, const kernelArg &arg13, const kernelArg &arg14, const kernelArg &arg15,\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20,\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -284,6 +309,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20,\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25,\nconst kernelArg &arg26) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -299,6 +325,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20,\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25,\nconst kernelArg &arg26, const kernelArg &arg27) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -314,6 +341,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20,\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25,\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -329,6 +357,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20,\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25,\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -344,6 +373,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg16, const kernelArg &arg17, const kernelArg &arg18, const kernelArg &arg19, const kernelArg &arg20,\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25,\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -360,6 +390,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25,\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30,\nconst kernelArg &arg31) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -377,6 +408,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25,\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30,\nconst kernelArg &arg31, const kernelArg &arg32) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -394,6 +426,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25,\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30,\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -411,6 +444,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25,\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30,\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -428,6 +462,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg21, const kernelArg &arg22, const kernelArg &arg23, const kernelArg &arg24, const kernelArg &arg25,\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30,\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -446,6 +481,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30,\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35,\nconst kernelArg &arg36) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -464,6 +500,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30,\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35,\nconst kernelArg &arg36, const kernelArg &arg37) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -482,6 +519,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30,\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35,\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -500,6 +538,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30,\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35,\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -518,6 +557,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg26, const kernelArg &arg27, const kernelArg &arg28, const kernelArg &arg29, const kernelArg &arg30,\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35,\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -537,6 +577,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35,\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40,\nconst kernelArg &arg41) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -557,6 +598,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35,\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40,\nconst kernelArg &arg41, const kernelArg &arg42) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -577,6 +619,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35,\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40,\nconst kernelArg &arg41, const kernelArg &arg42, const kernelArg &arg43) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -597,6 +640,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35,\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40,\nconst kernelArg &arg41, const kernelArg &arg42, const kernelArg &arg43, const kernelArg &arg44) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -617,6 +661,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg31, const kernelArg &arg32, const kernelArg &arg33, const kernelArg &arg34, const kernelArg &arg35,\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40,\nconst kernelArg &arg41, const kernelArg &arg42, const kernelArg &arg43, const kernelArg &arg44, const kernelArg &arg45) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -638,6 +683,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40,\nconst kernelArg &arg41, const kernelArg &arg42, const kernelArg &arg43, const kernelArg &arg44, const kernelArg &arg45,\nconst kernelArg &arg46) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -659,6 +705,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40,\nconst kernelArg &arg41, const kernelArg &arg42, const kernelArg &arg43, const kernelArg &arg44, const kernelArg &arg45,\nconst kernelArg &arg46, const kernelArg &arg47) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -680,6 +727,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40,\nconst kernelArg &arg41, const kernelArg &arg42, const kernelArg &arg43, const kernelArg &arg44, const kernelArg &arg45,\nconst kernelArg &arg46, const kernelArg &arg47, const kernelArg &arg48) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -701,6 +749,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40,\nconst kernelArg &arg41, const kernelArg &arg42, const kernelArg &arg43, const kernelArg &arg44, const kernelArg &arg45,\nconst kernelArg &arg46, const kernelArg &arg47, const kernelArg &arg48, const kernelArg &arg49) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n@@ -722,6 +771,7 @@ void kernel::operator() (const kernelArg &arg1, const kernelArg &arg2, const ker\nconst kernelArg &arg36, const kernelArg &arg37, const kernelArg &arg38, const kernelArg &arg39, const kernelArg &arg40,\nconst kernelArg &arg41, const kernelArg &arg42, const kernelArg &arg43, const kernelArg &arg44, const kernelArg &arg45,\nconst kernelArg &arg46, const kernelArg &arg47, const kernelArg &arg48, const kernelArg &arg49, const kernelArg &arg50) const {\n+ assertInitialized();\nkernelArg args[] = {\narg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,\narg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20,\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Kernel] Adds initialization check on kernel call (#268)
|
378,349 |
06.12.2019 23:04:55
| 18,000 |
4b01a583d7e4e97ac6192102173a4aabcd52b04e
|
[Serial] Fix use_host_pointer when ptr is NULL
|
[
{
"change_type": "MODIFY",
"old_path": "src/modes/serial/device.cpp",
"new_path": "src/modes/serial/device.cpp",
"diff": "@@ -356,7 +356,7 @@ namespace occa {\nconst occa::properties &props) {\nmemory *mem = new memory(this, bytes, props);\n- if (props.get(\"use_host_pointer\", false)) {\n+ if (src && props.get(\"use_host_pointer\", false)) {\nmem->ptr = (char*) const_cast<void*>(src);\nmem->isOrigin = props.get(\"own_host_pointer\", false);\n} else {\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/src/core/memory.cpp",
"new_path": "tests/src/core/memory.cpp",
"diff": "@@ -17,6 +17,7 @@ void testMalloc() {\nint *hostPtr = &value;\nocca::memory mem = occa::malloc(bytes);\n+ ASSERT_NEQ(mem.ptr(), (void*) NULL);\nmem = occa::malloc(bytes, hostPtr);\nASSERT_EQ(((int*) mem.ptr())[0], value);\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Serial] Fix use_host_pointer when ptr is NULL (#267)
|
378,349 |
07.12.2019 02:52:52
| 18,000 |
9fa9e11290124948bf1e599578660fe4c5c63cf7
|
[Dev] Adds okl-mode.el
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "scripts/okl-mode.el",
"diff": "+(require 'cc-mode)\n+\n+(eval-when-compile\n+ (require 'cc-langs)\n+ (require 'cc-fonts))\n+\n+(eval-and-compile\n+ (c-add-language 'okl-mode 'objc-mode))\n+\n+(c-lang-defconst c-primitive-type-kwds\n+ \"Primitives\"\n+ okl (append\n+ (append (c-lang-const c-primitive-type-kwds) nil)\n+ '(\"bool2\" \"bool3\" \"bool4\"\n+ \"char2\" \"char3\" \"char4\"\n+ \"short2\" \"short3\" \"short4\"\n+ \"int2\" \"int3\" \"int4\"\n+ \"long2\" \"long3\" \"long4\"\n+ \"float2\" \"float3\" \"float4\"\n+ \"double2\" \"double3\" \"double4\")))\n+\n+(defcustom okl-font-lock-extra-types nil\n+ \"*List of extra types (aside from the type keywords) to recognize in OKL mode.\n+Each list item should be a regexp matching a single identifier.\")\n+\n+(defconst okl-font-lock-keywords-1 (c-lang-const c-matchers-1 objc)\n+ \"Minimal highlighting for OKL mode.\")\n+\n+(defconst okl-font-lock-keywords-2 (c-lang-const c-matchers-2 objc)\n+ \"Fast normal highlighting for OKL mode.\")\n+\n+;; Set @annotation coloring from java-mode\n+(defconst okl-font-lock-keywords-3 (c-lang-const c-matchers-3 java)\n+ \"Accurate normal highlighting for OKL mode.\")\n+\n+(defvar okl-font-lock-keywords okl-font-lock-keywords-3\n+ \"Default expressions to highlight in OKL mode.\")\n+\n+(defvar okl-mode-map\n+ (let ((map (c-make-inherited-keymap)))\n+ map)\n+ \"Keymap used in okl-mode buffers.\")\n+\n+(easy-menu-define okl-menu okl-mode-map \"OKL Mode Commands\"\n+ (cons \"OKL\" (c-lang-const c-mode-menu okl)))\n+\n+(defvar okl-mode-syntax-table nil\n+ \"Syntax table used in okl-mode buffers.\")\n+(or okl-mode-syntax-table\n+ (setq okl-mode-syntax-table\n+ (funcall (c-lang-const c-make-mode-syntax-table objc))))\n+\n+(defvar okl-mode-abbrev-table nil\n+ \"Abbreviation table used in okl-mode buffers.\")\n+(c-define-abbrev-table 'okl-mode-abbrev-table\n+ '())\n+\n+(defun okl-mode ()\n+ \"Major mode for editing OKL\"\n+ (interactive)\n+ (kill-all-local-variables)\n+ (c-initialize-cc-mode t)\n+ (set-syntax-table okl-mode-syntax-table)\n+ (setq major-mode 'okl-mode\n+ mode-name \"OKL\"\n+ local-abbrev-table okl-mode-abbrev-table\n+ abbrev-mode t)\n+ (use-local-map objc-mode-map)\n+ (c-init-language-vars okl-mode)\n+ (c-common-init 'okl-mode)\n+ (easy-menu-add okl-menu)\n+ (run-hooks 'c-mode-common-hook)\n+ (run-hooks 'okl-mode-hook)\n+ (c-update-modeline))\n+\n+(setq okl-mode-hook ())\n+(add-hook 'okl-mode-hook\n+ (lambda ()\n+ (c-set-offset 'annotation-var-cont 0)\n+ ; Set Java @annotation indentation (hard-coded in cc-engine :()\n+ (setq c-buffer-is-cc-mode 'java-mode)\n+ ))\n+\n+(add-to-list 'auto-mode-alist '(\"\\\\.okl\\\\'\" . okl-mode))\n+\n+(provide 'derived-mode-ex)\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Dev] Adds okl-mode.el (#269)
|
378,349 |
07.12.2019 03:10:40
| 18,000 |
67b4ba44679b40ab64506f4a0df9b7500625f731
|
[Dev] Updates annotation coloring
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/okl-mode.el",
"new_path": "scripts/okl-mode.el",
"diff": "@@ -29,8 +29,11 @@ Each list item should be a regexp matching a single identifier.\")\n(defconst okl-font-lock-keywords-2 (c-lang-const c-matchers-2 objc)\n\"Fast normal highlighting for OKL mode.\")\n-;; Set @annotation coloring from java-mode\n-(defconst okl-font-lock-keywords-3 (c-lang-const c-matchers-3 java)\n+;; Set @annotation coloring\n+(defconst okl-font-lock-keywords-3\n+ (append\n+ (c-lang-const c-matchers-3 objc)\n+ `((eval . (list \"\\\\<\\\\(@[a-zA-Z0-9]+\\\\)\\\\>\" 1 c-annotation-face))))\n\"Accurate normal highlighting for OKL mode.\")\n(defvar okl-font-lock-keywords okl-font-lock-keywords-3\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Dev] Updates annotation coloring
|
378,349 |
07.12.2019 03:15:58
| 18,000 |
0a776961f420e0eb7c46d8cefdc35644a93b43e0
|
[Dev] Keeps more C++ syntax highlighting
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/okl-mode.el",
"new_path": "scripts/okl-mode.el",
"diff": "\"*List of extra types (aside from the type keywords) to recognize in OKL mode.\nEach list item should be a regexp matching a single identifier.\")\n-(defconst okl-font-lock-keywords-1 (c-lang-const c-matchers-1 objc)\n+(defconst okl-font-lock-keywords-1 (c-lang-const c-matchers-1 c++)\n\"Minimal highlighting for OKL mode.\")\n-(defconst okl-font-lock-keywords-2 (c-lang-const c-matchers-2 objc)\n+(defconst okl-font-lock-keywords-2 (c-lang-const c-matchers-2 c++)\n\"Fast normal highlighting for OKL mode.\")\n;; Set @annotation coloring\n(defconst okl-font-lock-keywords-3\n(append\n- (c-lang-const c-matchers-3 objc)\n+ (c-lang-const c-matchers-3 c++)\n`((eval . (list \"\\\\<\\\\(@[a-zA-Z0-9]+\\\\)\\\\>\" 1 c-annotation-face))))\n\"Accurate normal highlighting for OKL mode.\")\n@@ -51,7 +51,7 @@ Each list item should be a regexp matching a single identifier.\")\n\"Syntax table used in okl-mode buffers.\")\n(or okl-mode-syntax-table\n(setq okl-mode-syntax-table\n- (funcall (c-lang-const c-make-mode-syntax-table objc))))\n+ (funcall (c-lang-const c-make-mode-syntax-table c++))))\n(defvar okl-mode-abbrev-table nil\n\"Abbreviation table used in okl-mode buffers.\")\n@@ -68,7 +68,7 @@ Each list item should be a regexp matching a single identifier.\")\nmode-name \"OKL\"\nlocal-abbrev-table okl-mode-abbrev-table\nabbrev-mode t)\n- (use-local-map objc-mode-map)\n+ (use-local-map c++-mode-map)\n(c-init-language-vars okl-mode)\n(c-common-init 'okl-mode)\n(easy-menu-add okl-menu)\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Dev] Keeps more C++ syntax highlighting
|
378,349 |
07.12.2019 09:12:26
| 18,000 |
711709e910a8958d38f7165e1c708be7fdd0c33d
|
[Dev] okl-mode crashes less
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/okl-mode.el",
"new_path": "scripts/okl-mode.el",
"diff": "\"float2\" \"float3\" \"float4\"\n\"double2\" \"double3\" \"double4\")))\n+;; Required defines for extending C++ mode\n+(c-lang-defconst c-opt-friend-key\n+ okl (c-lang-const c-opt-friend-key c++))\n+\n+(c-lang-defconst c-opt-inexpr-brace-list-key\n+ okl (c-lang-const c-opt-inexpr-brace-list-key c++))\n+\n+(c-lang-defconst c-opt-postfix-decl-spec-key\n+ okl (c-lang-const c-opt-postfix-decl-spec-key c++))\n+\n+;; Syntax highlighting\n(defcustom okl-font-lock-extra-types nil\n\"*List of extra types (aside from the type keywords) to recognize in OKL mode.\nEach list item should be a regexp matching a single identifier.\")\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Dev] okl-mode crashes less
|
378,349 |
07.12.2019 11:42:15
| 18,000 |
7aff4803e6a6f6dde03683718d300ba588fb9eae
|
[Kernel] Adds occa::null
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/core/kernelArg.hpp",
"new_path": "include/occa/core/kernelArg.hpp",
"diff": "@@ -17,8 +17,16 @@ namespace occa {\nnamespace kArgInfo {\nstatic const char none = 0;\nstatic const char usePointer = (1 << 0);\n+ static const char isNull = (1 << 1);\n}\n+ class null_t {\n+ public:\n+ inline null_t() {}\n+ };\n+\n+ extern const null_t null;\n+\nunion kernelArgData_t {\nuint8_t uint8_;\nuint16_t uint16_;\n@@ -54,6 +62,8 @@ namespace occa {\nvoid* ptr() const;\n+ bool isNull() const;\n+\nvoid setupForKernelCall(const bool isConst) const;\n};\n@@ -67,6 +77,8 @@ namespace occa {\nkernelArg(const kernelArg &other);\nkernelArg& operator = (const kernelArg &other);\n+ kernelArg(const null_t arg);\n+\nkernelArg(const uint8_t arg);\nkernelArg(const uint16_t arg);\nkernelArg(const uint32_t arg);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/kernel.cpp",
"new_path": "src/core/kernel.cpp",
"diff": "@@ -107,7 +107,8 @@ namespace occa {\nlang::argMetadata_t &argInfo = metadata.arguments[i];\nmodeMemory_t *mem = arg.getModeMemory();\n- bool isPtr = (bool) mem;\n+ const bool isNull = arg.isNull();\n+ const bool isPtr = mem || isNull;\nif (isPtr != argInfo.isPtr) {\nif (argInfo.isPtr) {\nOCCA_FORCE_ERROR(\"(\" << name << \") Kernel expects an occa::memory for argument [\"\n@@ -118,7 +119,7 @@ namespace occa {\n}\n}\n- if (!isPtr) {\n+ if (!isPtr || isNull) {\ncontinue;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/kernelArg.cpp",
"new_path": "src/core/kernelArg.cpp",
"diff": "namespace occa {\n//---[ KernelArg ]--------------------\n+ const null_t null;\n+\nkernelArgData::kernelArgData() :\nmodeMemory(NULL),\nsize(0),\n@@ -45,6 +47,10 @@ namespace occa {\nreturn ((info & kArgInfo::usePointer) ? data.void_ : (void*) &data);\n}\n+ bool kernelArgData::isNull() const {\n+ return (info & kArgInfo::isNull);\n+ }\n+\nvoid kernelArgData::setupForKernelCall(const bool isConst) const {\nif (!modeMemory ||\n!modeMemory->isManaged() ||\n@@ -107,6 +113,17 @@ namespace occa {\nreturn args[index];\n}\n+ kernelArg::kernelArg(const null_t arg) {\n+ kernelArgData kArg;\n+ kArg.data.void_ = NULL;\n+ kArg.size = sizeof(void*);\n+ kArg.info = (\n+ kArgInfo::usePointer\n+ | kArgInfo::isNull\n+ );\n+ args.push_back(kArg);\n+ }\n+\nkernelArg::kernelArg(const uint8_t arg) {\nkernelArgData kArg;\nkArg.data.uint8_ = arg;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/files/argKernel.okl",
"new_path": "tests/files/argKernel.okl",
"diff": "@kernel void argKernel(char *mem,\nchar *uvaPtr,\n+ void *null,\nint i8,\nint u8,\nint i16,\nprintf(\n\"mem: %d\\n\"\n\"uvaPtr: %d\\n\"\n+ \"null: %p\\n\"\n\"i8: %d\\n\"\n\"u8: %d\\n\"\n\"i16: %d\\n\"\n\"str: %s\\n\",\nmem[0],\nuvaPtr[0],\n+ null,\n(int) i8,\n(int) u8,\n(int) i16,\nxy[0], xy[1],\nstr\n);\n+ if (null != NULL) {\n+ throw 1;\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/src/core/kernel.cpp",
"new_path": "tests/src/core/kernel.cpp",
"diff": "@@ -163,6 +163,7 @@ void testRun() {\nargKernel(\nmem,\nuvaPtr,\n+ occa::null,\n(int8_t) 2,\n(uint8_t) 3,\n(int16_t) 4,\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Kernel] Adds occa::null (#270)
|
378,349 |
07.12.2019 22:34:35
| 18,000 |
86dead2584f4d2479e092935a26350a7bd6b2b25
|
[OpenCL] Fixed OpenCL timing
|
[
{
"change_type": "MODIFY",
"old_path": "src/modes/opencl/device.cpp",
"new_path": "src/modes/opencl/device.cpp",
"diff": "@@ -141,7 +141,7 @@ namespace occa {\nfinish();\n- return (clStartTag->getTime() - clEndTag->getTime());\n+ return (clEndTag->getTime() - clStartTag->getTime());\n}\ncl_command_queue& device::getCommandQueue() const {\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[OpenCL] Fixed OpenCL timing
|
378,349 |
08.12.2019 10:51:29
| 18,000 |
b43bc113122c13a4508b0d7065eed70a1bd7bec1
|
[C][Kernel] Fixes a varargs macro bug for running C kernels
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa.h",
"new_path": "include/occa.h",
"diff": "// Just in case someone wants to run with an older format than C99\n#ifndef OCCA_DISABLE_VARIADIC_MACROS\n-#define OCCA_C_RUN_KERNEL3(N, kernel, ...) occaKernelRunN(kernel, N, __VA_ARGS__)\n-#define OCCA_C_RUN_KERNEL2(...) OCCA_C_RUN_KERNEL3(__VA_ARGS__)\n-#define OCCA_C_RUN_KERNEL1(...) OCCA_C_RUN_KERNEL2(__VA_ARGS__)\n+#define OCCA_C_RUN_KERNEL3(kernel, N, ...) \\\n+ occaKernelRunN(kernel, N, __VA_ARGS__)\n-#define occaKernelRun(...) OCCA_C_RUN_KERNEL1(OCCA_ARG_COUNT(__VA_ARGS__), __VA_ARGS__)\n+#define OCCA_C_RUN_KERNEL2(kernel, N, ...) \\\n+ OCCA_C_RUN_KERNEL3(kernel, N, __VA_ARGS__)\n+\n+#define OCCA_C_RUN_KERNEL1(kernel, N, ...) \\\n+ OCCA_C_RUN_KERNEL2(kernel, N, __VA_ARGS__)\n+\n+#define occaKernelRun(kernel, ...) \\\n+ OCCA_C_RUN_KERNEL1(kernel, OCCA_ARG_COUNT(__VA_ARGS__), __VA_ARGS__)\n#endif // OCCA_DISABLE_VARIADIC_MACROS\n"
},
{
"change_type": "MODIFY",
"old_path": "src/c/kernel.cpp",
"new_path": "src/c/kernel.cpp",
"diff": "@@ -118,6 +118,7 @@ void OCCA_RFUNC occaKernelRunN(occaKernel kernel,\nva_list args;\nva_start(args, argc);\noccaKernelVaRun(kernel, argc, args);\n+ va_end(args);\n}\nvoid OCCA_RFUNC occaKernelVaRun(occaKernel kernel,\n@@ -131,12 +132,15 @@ void OCCA_RFUNC occaKernelVaRun(occaKernel kernel,\nmodeKernel.arguments.clear();\nmodeKernel.arguments.reserve(argc);\n+ va_list runArgs;\n+ va_copy(runArgs, args);\nfor (int i = 0; i < argc; ++i) {\n- occaType arg = va_arg(args, occaType);\n+ occaType arg = va_arg(runArgs, occaType);\nmodeKernel.pushArgument(\nocca::c::kernelArg(arg)\n);\n}\n+ va_end(runArgs);\nkernel_.run();\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[C][Kernel] Fixes a varargs macro bug for running C kernels (#271)
|
378,349 |
14.12.2019 18:27:40
| 21,600 |
82474e6bf70ecc276d73c9089d40430c9a6e338a
|
[Kernel] Fixes kernel argument mismatch message
|
[
{
"change_type": "MODIFY",
"old_path": "config.default.json",
"new_path": "config.default.json",
"diff": "stale_warning: 10.0,\nstale_age: 20.0,\n},\n- // OKL settings\n- okl: {\n- validate: true,\n- },\n},\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/kernel.cpp",
"new_path": "src/core/kernel.cpp",
"diff": "@@ -95,10 +95,10 @@ namespace occa {\nconst int metaArgc = (int) metadata.arguments.size();\nOCCA_ERROR(\"(\" << name << \") Kernel expects [\"\n- << argc << \"] argument\"\n- << (argc != 1 ? \"s,\" : \",\")\n+ << metaArgc << \"] argument\"\n+ << (metaArgc != 1 ? \"s,\" : \",\")\n<< \" received [\"\n- << metaArgc << ']',\n+ << argc << ']',\nargc == metaArgc);\n// TODO: Get original arg #\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Kernel] Fixes kernel argument mismatch message
|
378,349 |
14.12.2019 20:15:09
| 21,600 |
4bd3442a055a803b4f5d0859b8ffd4b0fe575621
|
[Preprocessor] Fixes loading @ directive inside #if/#else statements
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/lang/preprocessor.hpp",
"new_path": "include/occa/lang/preprocessor.hpp",
"diff": "@@ -129,6 +129,11 @@ namespace occa {\nvoid removeNewline(tokenVector &lineTokens);\nvoid processToken(token_t *token);\n+\n+ bool canProcessWhileIgnoring(token_t *token);\n+ bool processingDirectiveAttribute(operatorToken &opToken,\n+ token_t *&directiveToken);\n+\nvoid processIdentifier(identifierToken &token);\nvoid processOperator(operatorToken &opToken);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/lang/preprocessor.cpp",
"new_path": "src/lang/preprocessor.cpp",
"diff": "@@ -464,8 +464,7 @@ namespace occa {\n// Only process operators when ignoring\n// for potential #\nif (status & ppStatus::ignoring) {\n- if (!(tokenType & tokenType::op) ||\n- !(token->getOpType() & operatorType::preprocessor)) {\n+ if (!canProcessWhileIgnoring(token)) {\nclearExpandedMacros(token);\ndelete token;\nreturn;\n@@ -485,6 +484,41 @@ namespace occa {\nclearExpandedMacros(token);\n}\n+ bool preprocessor_t::canProcessWhileIgnoring(token_t *token) {\n+ opType_t opType = token->getOpType();\n+ // Can process # directive to stop an #if/#else/#elif\n+ if (opType & operatorType::hash) {\n+ return true;\n+ }\n+ // Can process @directive directives\n+ if (opType & operatorType::attribute) {\n+ token_t *directiveToken;\n+ const bool isDirective = (\n+ processingDirectiveAttribute(token->to<operatorToken>(),\n+ directiveToken)\n+ );\n+ // Push the directive token as well\n+ if (directiveToken) {\n+ pushInput(directiveToken);\n+ }\n+\n+ return isDirective;\n+ }\n+\n+ return false;\n+ }\n+\n+ bool preprocessor_t::processingDirectiveAttribute(operatorToken &opToken,\n+ token_t *&directiveToken) {\n+ // Check for @[directive]\n+ directiveToken = getSourceToken();\n+ return (\n+ (token_t::safeType(directiveToken) & tokenType::identifier) &&\n+ (directiveToken->to<identifierToken>().value == \"directive\")\n+ );\n+ }\n+\n+\nvoid preprocessor_t::processIdentifier(identifierToken &token) {\n// Ignore tokens inside disabled #if/#elif/#else regions\nif (status & ppStatus::ignoring) {\n@@ -598,13 +632,8 @@ namespace occa {\n}\nvoid preprocessor_t::processAttributeOperator(operatorToken &opToken) {\n- // Check for @[directive]\n- token_t *directiveToken = getSourceToken();\n- const bool isDirective = (\n- (token_t::safeType(directiveToken) & tokenType::identifier) &&\n- (directiveToken->to<identifierToken>().value == \"directive\")\n- );\n- if (!isDirective) {\n+ token_t *directiveToken;\n+ if (!processingDirectiveAttribute(opToken, directiveToken)) {\n// Push the [@] token directly\npushOutput(&opToken);\n// The next token still needs to be processed\n@@ -616,6 +645,7 @@ namespace occa {\n// Freeze our outputs and expand the rest of our symbols\nstd::list<token_t*> prevOutputCache = outputCache;\n+ pushStatus(ppStatus::reading);\noutputCache.clear();\n// Make sure we have a tokenizer\n@@ -623,6 +653,7 @@ namespace occa {\nif (!tokenizer) {\nwarningOn(directiveToken,\n\"Unable to apply @directive due to the lack of a tokenizer\");\n+ popStatus();\nreturn freeAttributeOperatorTokens(opToken,\n*directiveToken,\nprevOutputCache);\n@@ -635,14 +666,17 @@ namespace occa {\nfetchNext();\nif ((errors > currentErrors) ||\n(tokenizer->errors > currentTokenizerErrors)) {\n+ popStatus();\nreturn freeAttributeOperatorTokens(opToken,\n*directiveToken,\nprevOutputCache);\n}\n}\n+\nif (outputCache.size() < 3) {\nerrorOn(directiveToken,\n- \"@directive expects a string argument\");\n+ \"[1] @directive expects a string argument\");\n+ popStatus();\nreturn freeAttributeOperatorTokens(opToken,\n*directiveToken,\nprevOutputCache);\n@@ -662,11 +696,12 @@ namespace occa {\n|| !(token_t::safeOperatorType(parenEndToken) & operatorType::parenthesesEnd)\n) {\nerrorOn(directiveToken,\n- \"@directive expects a string argument\");\n+ \"[2] @directive expects a string argument\");\ndelete parenStartToken;\ndelete contentToken;\ndelete parenEndToken;\nskipToNewline();\n+ popStatus();\nreturn freeAttributeOperatorTokens(opToken,\n*directiveToken,\nprevOutputCache);\n@@ -696,6 +731,7 @@ namespace occa {\ndelete parenStartToken;\ndelete contentToken;\ndelete parenEndToken;\n+ popStatus();\nreturn freeAttributeOperatorTokens(opToken,\n*directiveToken,\nprevOutputCache);\n@@ -718,6 +754,7 @@ namespace occa {\n// Bring back the original output cache\noutputCache = prevOutputCache;\n+ popStatus();\n}\nvoid preprocessor_t::freeAttributeOperatorTokens(token_t &opToken,\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Preprocessor] Fixes loading @ directive inside #if/#else statements (#274)
|
378,349 |
14.12.2019 20:52:29
| 21,600 |
96db672189bdb05c2c0ee859bc08c495d4db77e7
|
[OCCA] Uninitialized memory passed as null
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/core/kernelArg.hpp",
"new_path": "include/occa/core/kernelArg.hpp",
"diff": "@@ -20,12 +20,12 @@ namespace occa {\nstatic const char isNull = (1 << 1);\n}\n- class null_t {\n+ class nullKernelArg_t {\npublic:\n- inline null_t() {}\n+ inline nullKernelArg_t() {}\n};\n- extern const null_t null;\n+ extern const nullKernelArg_t nullKernelArg;\nunion kernelArgData_t {\nuint8_t uint8_;\n@@ -77,7 +77,7 @@ namespace occa {\nkernelArg(const kernelArg &other);\nkernelArg& operator = (const kernelArg &other);\n- kernelArg(const null_t arg);\n+ kernelArg(const nullKernelArg_t arg);\nkernelArg(const uint8_t arg);\nkernelArg(const uint16_t arg);\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/core/memory.hpp",
"new_path": "include/occa/core/memory.hpp",
"diff": "@@ -104,6 +104,7 @@ namespace occa {\n};\n//====================================\n+\n//---[ memory ]-----------------------\nclass memory : public gc::ringEntry_t {\nfriend class occa::modeMemory_t;\n@@ -238,6 +239,8 @@ namespace occa {\nvoid detach();\nvoid deleteRefs(const bool freeMemory = false);\n};\n+\n+ extern memory null;\n//====================================\nstd::ostream& operator << (std::ostream &out,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/kernelArg.cpp",
"new_path": "src/core/kernelArg.cpp",
"diff": "namespace occa {\n//---[ KernelArg ]--------------------\n- const null_t null;\n+ const nullKernelArg_t nullKernelArg;\nkernelArgData::kernelArgData() :\nmodeMemory(NULL),\n@@ -113,7 +113,7 @@ namespace occa {\nreturn args[index];\n}\n- kernelArg::kernelArg(const null_t arg) {\n+ kernelArg::kernelArg(const nullKernelArg_t arg) {\nkernelArgData kArg;\nkArg.data.void_ = NULL;\nkArg.size = sizeof(void*);\n@@ -221,7 +221,7 @@ namespace occa {\nif (modeMemory) {\nadd(modeMemory->makeKernelArg());\n- } else {\n+ } else if (arg != NULL) {\nkernelArgData kArg;\nkArg.data.void_ = arg;\nkArg.size = bytes;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/memory.cpp",
"new_path": "src/core/memory.cpp",
"diff": "@@ -67,6 +67,8 @@ namespace occa {\nbool modeMemory_t::isStale() const {\nreturn (memInfo & uvaFlag::isStale);\n}\n+ //====================================\n+\n//---[ memory ]-----------------------\nmemory::memory() :\n@@ -189,7 +191,7 @@ namespace occa {\nif (modeMemory) {\nreturn modeMemory->makeKernelArg();\n}\n- return kernelArg((void*) NULL);\n+ return nullKernelArg;\n}\nconst std::string& memory::mode() const {\n@@ -587,6 +589,9 @@ namespace occa {\nmodeMemory = NULL;\n}\n+ memory null;\n+ //====================================\n+\nstd::ostream& operator << (std::ostream &out,\nconst occa::memory &memory) {\nout << memory.properties();\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[OCCA] Uninitialized memory passed as null (#275)
|
378,349 |
19.12.2019 16:38:15
| 21,600 |
786ba4642ad1a23116bacfe1623d0e942333bb43
|
[Emacs] Update annotation keyword regex
|
[
{
"change_type": "MODIFY",
"old_path": "scripts/okl-mode.el",
"new_path": "scripts/okl-mode.el",
"diff": "@@ -44,7 +44,7 @@ Each list item should be a regexp matching a single identifier.\")\n(defconst okl-font-lock-keywords-3\n(append\n(c-lang-const c-matchers-3 c++)\n- `((eval . (list \"\\\\<\\\\(@[a-zA-Z0-9]+\\\\)\\\\>\" 1 c-annotation-face))))\n+ `((eval . (list \"\\\\<\\\\(@[a-zA-Z][a-zA-Z0-9_]*\\\\)\\\\>\" 1 c-annotation-face))))\n\"Accurate normal highlighting for OKL mode.\")\n(defvar okl-font-lock-keywords okl-font-lock-keywords-3\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Emacs] Update annotation keyword regex
|
378,349 |
20.12.2019 00:30:46
| 21,600 |
6494aa926ebc350c89ab646660188effdccdd4d7
|
[Core] Fix memory reference double-free with slices
|
[
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/memory.cpp",
"new_path": "src/modes/cuda/memory.cpp",
"diff": "@@ -13,21 +13,16 @@ namespace occa {\nisUnified(false) {}\nmemory::~memory() {\n- if (!isOrigin) {\n- cuPtr = 0;\n- mappedPtr = NULL;\n- size = 0;\n- return;\n- }\n-\n+ if (isOrigin) {\nif (mappedPtr) {\nOCCA_CUDA_ERROR(\"Device: mappedFree()\",\ncuMemFreeHost(mappedPtr));\n- mappedPtr = NULL;\n} else if (cuPtr) {\ncuMemFree(cuPtr);\n- cuPtr = 0;\n}\n+ }\n+ cuPtr = 0;\n+ mappedPtr = NULL;\nsize = 0;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/hip/memory.cpp",
"new_path": "src/modes/hip/memory.cpp",
"diff": "@@ -20,21 +20,16 @@ namespace occa {\nmappedPtr(NULL) {}\nmemory::~memory() {\n- if (!isOrigin) {\n- hipPtr = 0;\n- mappedPtr = NULL;\n- size = 0;\n- return;\n- }\n-\n+ if (isOrigin) {\nif (mappedPtr) {\nOCCA_HIP_ERROR(\"Device: mappedFree()\",\nhipHostFree(mappedPtr));\n- mappedPtr = NULL;\n} else if (hipPtr) {\nhipFree((void*) hipPtr);\n- hipPtr = 0;\n}\n+ }\n+ hipPtr = 0;\n+ mappedPtr = NULL;\nsize = 0;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/metal/memory.cpp",
"new_path": "src/modes/metal/memory.cpp",
"diff": "@@ -11,8 +11,11 @@ namespace occa {\nbufferOffset(0) {}\nmemory::~memory() {\n+ if (isOrigin) {\nmetalBuffer.free();\n}\n+ size = 0;\n+ }\nkernelArg memory::makeKernelArg() const {\nkernelArgData arg;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/opencl/memory.cpp",
"new_path": "src/modes/opencl/memory.cpp",
"diff": "@@ -12,6 +12,7 @@ namespace occa {\nmappedPtr(NULL) {}\nmemory::~memory() {\n+ if (isOrigin) {\nif (mappedPtr) {\nOCCA_OPENCL_ERROR(\"Mapped Free: clEnqueueUnmapMemObject\",\nclEnqueueUnmapMemObject(getCommandQueue(),\n@@ -23,9 +24,12 @@ namespace occa {\n// Free mapped-host pointer\nOCCA_OPENCL_ERROR(\"Mapped Free: clReleaseMemObject\",\nclReleaseMemObject(clMem));\n- size = 0;\n}\n}\n+ clMem = NULL;\n+ mappedPtr = NULL;\n+ size = 0;\n+ }\ncl_command_queue& memory::getCommandQueue() const {\nreturn ((device*) modeDevice)->getCommandQueue();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/serial/memory.cpp",
"new_path": "src/modes/serial/memory.cpp",
"diff": "@@ -10,14 +10,12 @@ namespace occa {\nocca::modeMemory_t(modeDevice_, size_, properties_) {}\nmemory::~memory() {\n- if (ptr) {\n- if (isOrigin) {\n+ if (ptr && isOrigin) {\nsys::free(ptr);\n}\nptr = NULL;\nsize = 0;\n}\n- }\nkernelArg memory::makeKernelArg() const {\nkernelArgData arg;\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Core] Fix memory reference double-free with slices (#276)
|
378,349 |
25.12.2019 21:53:10
| 21,600 |
eebc15becbaaf892c285e3d22a673d929470a00d
|
[Kernel] Fix headers prop
|
[
{
"change_type": "MODIFY",
"old_path": "config.default.json",
"new_path": "config.default.json",
"diff": "include: [],\n// List of source-code snippets to include at the top of the source code\n- header: [],\n+ headers: [],\n// OKL Options\nokl: {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/kernel.cpp",
"new_path": "src/core/kernel.cpp",
"diff": "@@ -324,14 +324,14 @@ namespace occa {\n// Properties:\n// defines : Object\n// includes : Array\n- // header : Array\n+ // headers : Array\n// include_paths : Array\nhash_t kernelHeaderHash(const occa::properties &props) {\nreturn (\nocca::hash(props[\"defines\"])\n^ props[\"includes\"]\n- ^ props[\"header\"]\n+ ^ props[\"headers\"]\n);\n}\n@@ -363,10 +363,10 @@ namespace occa {\n}\n// Add header\n- const jsonArray &lines = props[\"header\"].array();\n+ const jsonArray &lines = props[\"headers\"].array();\nconst int lineCount = (int) lines.size();\nfor (int i = 0; i < lineCount; ++i) {\n- if (includes[i].isString()) {\n+ if (lines[i].isString()) {\nheader += (std::string) lines[i];\nheader += \"\\n\";\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Kernel] Fix headers prop (#279)
|
378,345 |
18.02.2020 10:35:37
| -19,080 |
e3dfd526b5556231e2ba3e225f848802114dd4da
|
Assert chosen mode exists
|
[
{
"change_type": "MODIFY",
"old_path": "src/modes.cpp",
"new_path": "src/modes.cpp",
"diff": "@@ -18,15 +18,10 @@ namespace occa {\nmode_v* getMode(const occa::properties &props) {\nstd::string mode = props[\"mode\"];\n- const bool noMode = !mode.size();\n- if (noMode || !modeIsEnabled(mode)) {\n- if (noMode) {\n- io::stderr << \"No OCCA mode given, defaulting to [Serial] mode\\n\";\n- } else {\n- io::stderr << \"[\" << mode << \"] mode is not enabled, defaulting to [Serial] mode\\n\";\n- }\n- mode = \"Serial\";\n- }\n+\n+ OCCA_ERROR(\"No OCCA mode given\", mode.size() > 0);\n+ OCCA_ERROR(\"[\" << mode << \"] mode is not enabled\", modeIsEnabled(mode));\n+\nreturn modeMap()[mode];\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
Assert chosen mode exists (#282)
|
378,358 |
28.02.2020 15:58:49
| -3,600 |
682edfaf82dc5885c5f3db08a43143875b49ea4d
|
add OCCA_LDFLAGS to Serial
|
[
{
"change_type": "MODIFY",
"old_path": "bin/occa.cpp",
"new_path": "bin/occa.cpp",
"diff": "@@ -262,6 +262,7 @@ bool runEnv(const json &args) {\n<< \" Run-Time Options:\\n\"\n<< \" - OCCA_CXX : \" << envEcho(\"OCCA_CXX\") << \"\\n\"\n<< \" - OCCA_CXXFLAGS : \" << envEcho(\"OCCA_CXXFLAGS\") << \"\\n\"\n+ << \" - OCCA_LDFLAGS : \" << envEcho(\"OCCA_LDFLAGS\") << \"\\n\"\n<< \" - OCCA_INCLUDE_PATH : \" << envEcho(\"OCCA_INCLUDE_PATH\") << \"\\n\"\n<< \" - OCCA_LIBRARY_PATH : \" << envEcho(\"OCCA_LIBRARY_PATH\") << \"\\n\"\n<< \" - OCCA_OPENCL_COMPILER_FLAGS : \" << envEcho(\"OCCA_OPENCL_COMPILER_FLAGS\") << \"\\n\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/serial/device.cpp",
"new_path": "src/modes/serial/device.cpp",
"diff": "@@ -16,6 +16,7 @@ namespace occa {\nocca::json &kernelProps = properties[\"kernel\"];\nstd::string compiler, compilerFlags, compilerEnvScript;\n+ std::string linkerFlags;\nint vendor;\nif (kernelProps.get<std::string>(\"compiler\").size()) {\n@@ -48,6 +49,12 @@ namespace occa {\n#endif\n}\n+ if (kernelProps.get<std::string>(\"linker_flags\").size()) {\n+ linkerFlags = (std::string) kernelProps[\"linker_flags\"];\n+ } else if (env::var(\"OCCA_LDFLAGS\").size()) {\n+ linkerFlags = env::var(\"OCCA_LDFLAGS\");\n+ }\n+\nif (kernelProps.get<std::string>(\"compiler_env_script\").size()) {\ncompilerEnvScript = (std::string) kernelProps[\"compiler_env_script\"];\n} else {\n@@ -84,6 +91,7 @@ namespace occa {\nkernelProps[\"compiler\"] = compiler;\nkernelProps[\"compiler_flags\"] = compilerFlags;\nkernelProps[\"compiler_env_script\"] = compilerEnvScript;\n+ kernelProps[\"linker_flags\"] = linkerFlags;\n}\ndevice::~device() {}\n@@ -259,6 +267,8 @@ namespace occa {\nstd::string compilerFlags = kernelProps[\"compiler_flags\"];\nconst int vendor = (int) kernelProps[\"vendor\"];\n+ std::string linkerFlags = kernelProps[\"linker_flags\"];\n+\nsys::addSharedBinaryFlags(vendor, compilerFlags);\nsys::addCpp11Flags(vendor, compilerFlags);\n@@ -269,6 +279,7 @@ namespace occa {\n<< \" -o \" << binaryFilename\n<< \" -I\" << env::OCCA_DIR << \"include\"\n<< \" -L\" << env::OCCA_DIR << \"lib -locca\"\n+ << ' ' << linkerFlags\n<< std::endl;\n#else\ncommand << kernelProps[\"compiler\"]\n@@ -280,6 +291,7 @@ namespace occa {\n<< \" /I\" << env::OCCA_DIR << \"include\"\n<< ' ' << sourceFilename\n<< \" /link \" << env::OCCA_DIR << \"lib/libocca.lib\",\n+ << ' ' << linkerFlags\n<< \" /OUT:\" << binaryFilename\n<< std::endl;\n#endif\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
add OCCA_LDFLAGS to Serial (#284)
|
378,349 |
05.03.2020 10:29:04
| 18,000 |
e194bc58b46dd5e7317c6d2f14fd3b03bcaa0c2b
|
[OpenMP] Avoid generating same kernel hash as Serial mode
|
[
{
"change_type": "MODIFY",
"old_path": "src/modes/openmp/device.cpp",
"new_path": "src/modes/openmp/device.cpp",
"diff": "@@ -12,6 +12,7 @@ namespace occa {\nhash_t device::kernelHash(const occa::properties &props) const {\nreturn (\nocca::hash(props[\"vendor\"])\n+ ^ occa::hash(\"openmp\")\n^ props[\"compiler\"]\n^ props[\"compiler_flags\"]\n^ props[\"compiler_env_script\"]\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[OpenMP] Avoid generating same kernel hash as Serial mode (#289)
|
378,349 |
15.03.2020 08:47:08
| 18,000 |
b0dc70e27a2efaf230fda277b2c2cec6125c8799
|
[Make] Removes compiler warnings
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/cuda/polyfill.hpp",
"new_path": "include/occa/modes/cuda/polyfill.hpp",
"diff": "@@ -32,6 +32,8 @@ namespace occa {\nstatic const int CU_MEM_ATTACH_GLOBAL = 0;\nstatic const int CU_MEM_ATTACH_HOST = 0;\nstatic const int CU_STREAM_DEFAULT = 0;\n+ static const int CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR = 0;\n+ static const int CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR = 0;\nstatic const CUfunction_attribute CU_FUNC_ATTRIBUTE_MAX_THREADS_PER_BLOCK = NULL;\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/hip/polyfill.hpp",
"new_path": "include/occa/modes/hip/polyfill.hpp",
"diff": "@@ -23,9 +23,9 @@ namespace occa {\ntypedef struct _hipStream_t* hipStream_t;\n//---[ Enums ]------------------------\n- static void *HIP_LAUNCH_PARAM_BUFFER_POINTER = NULL;\n- static void *HIP_LAUNCH_PARAM_BUFFER_SIZE = NULL;\n- static void *HIP_LAUNCH_PARAM_END = NULL;\n+ static const int HIP_LAUNCH_PARAM_BUFFER_POINTER = 0;\n+ static const int HIP_LAUNCH_PARAM_BUFFER_SIZE = 0;\n+ static const int HIP_LAUNCH_PARAM_END = 0;\nstruct hipDeviceProp_t {\nchar *name;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/memory.cpp",
"new_path": "src/core/memory.cpp",
"diff": "@@ -384,7 +384,7 @@ namespace occa {\nconst int dtypeSize = modeMemory->dtype_->bytes();\nconst dim_t offset_ = dtypeSize * offset;\n- const udim_t bytes = dtypeSize * ((count == -1)\n+ const dim_t bytes = dtypeSize * ((count == -1)\n? (length() - offset)\n: count);\n@@ -567,16 +567,16 @@ namespace occa {\nmodeDevice->bytesAllocated -= (modeMemory->size);\nif (modeMemory->uvaPtr) {\n- void *ptr = modeMemory->ptr;\n+ void *memPtr = modeMemory->ptr;\nvoid *uvaPtr = modeMemory->uvaPtr;\nuvaMap.erase(uvaPtr);\nmodeDevice->uvaMap.erase(uvaPtr);\n// CPU case where memory is shared\n- if (uvaPtr != ptr) {\n- uvaMap.erase(ptr);\n- modeDevice->uvaMap.erase(ptr);\n+ if (uvaPtr != memPtr) {\n+ uvaMap.erase(memPtr);\n+ modeDevice->uvaMap.erase(memPtr);\nsys::free(uvaPtr);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/device.cpp",
"new_path": "src/modes/cuda/device.cpp",
"diff": "@@ -54,10 +54,21 @@ namespace occa {\nkernelProps[\"compiler\"] = compiler;\nkernelProps[\"compiler_flags\"] = compilerFlags;\n- OCCA_CUDA_ERROR(\"Device: Getting CUDA Device Arch\",\n+#if CUDA_VERSION < 5000\n+ OCCA_CUDA_ERROR(\"Device: Getting CUDA device arch\",\ncuDeviceComputeCapability(&archMajorVersion,\n&archMinorVersion,\ncuDevice));\n+#else\n+ OCCA_CUDA_ERROR(\"Device: Getting CUDA device major version\",\n+ cuDeviceGetAttribute(&archMajorVersion,\n+ CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR,\n+ cuDevice));\n+ OCCA_CUDA_ERROR(\"Device: Getting CUDA device minor version\",\n+ cuDeviceGetAttribute(&archMinorVersion,\n+ CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR,\n+ cuDevice));\n+#endif\narchMajorVersion = kernelProps.get(\"arch/major\", archMajorVersion);\narchMinorVersion = kernelProps.get(\"arch/minor\", archMinorVersion);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/hip/kernel.cpp",
"new_path": "src/modes/hip/kernel.cpp",
"diff": "@@ -46,8 +46,8 @@ namespace occa {\n}\ndim kernel::maxInnerDims() const {\n- static dim innerDims(0);\n- if (innerDims.x == 0) {\n+ static dim _maxInnerDims(0);\n+ if (_maxInnerDims.x == 0) {\nint maxSize;\nint deviceID = properties[\"device_id\"];\nhipDeviceProp_t props;\n@@ -55,9 +55,9 @@ namespace occa {\nhipGetDeviceProperties(&props, deviceID));\nmaxSize = props.maxThreadsPerBlock;\n- innerDims.x = maxSize;\n+ _maxInnerDims.x = maxSize;\n}\n- return innerDims;\n+ return _maxInnerDims;\n}\nvoid kernel::deviceRun() const {\n@@ -92,9 +92,9 @@ namespace occa {\nsize_t size = vArgs.size() * sizeof(vArgs[0]);\nvoid* config[] = {\n- HIP_LAUNCH_PARAM_BUFFER_POINTER, &(vArgs[0]),\n- HIP_LAUNCH_PARAM_BUFFER_SIZE, &size,\n- HIP_LAUNCH_PARAM_END\n+ (void*) HIP_LAUNCH_PARAM_BUFFER_POINTER, &(vArgs[0]),\n+ (void*) HIP_LAUNCH_PARAM_BUFFER_SIZE, &size,\n+ (void*) HIP_LAUNCH_PARAM_END\n};\nOCCA_HIP_ERROR(\"Launching Kernel\",\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Make] Removes compiler warnings (#291)
|
378,349 |
15.03.2020 09:31:37
| 18,000 |
1d070ae6e277703f3790b6c2a23475c3a01c4404
|
[OKL][CUDA] Fixes const -> __constant__ replacement on typedef statements
|
[
{
"change_type": "MODIFY",
"old_path": "src/lang/modes/cuda.cpp",
"new_path": "src/lang/modes/cuda.cpp",
"diff": "@@ -66,7 +66,7 @@ namespace occa {\nconst int declCount = declSmnt.declarations.size();\nfor (int di = 0; di < declCount; ++di) {\nvariable_t &var = *(declSmnt.declarations[di].variable);\n- if (var.has(const_)) {\n+ if (var.has(const_) && !var.has(typedef_)) {\nvar -= const_;\nvar += constant;\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[OKL][CUDA] Fixes const -> __constant__ replacement on typedef statements (#292)
|
378,349 |
15.03.2020 19:27:48
| 18,000 |
a4ea5ec35fd08c6667ae82ab5e19a75f69abdb18
|
[GC] Fixes refs on launched kernels
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/gc.hpp",
"new_path": "include/occa/tools/gc.hpp",
"diff": "@@ -51,6 +51,8 @@ namespace occa {\nvoid removeRef(entry_t *entry);\nbool needsFree() const;\n+\n+ int length() const;\n};\ntemplate <class entry_t>\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/tools/gc.tpp",
"new_path": "include/occa/tools/gc.tpp",
"diff": "@@ -20,7 +20,7 @@ namespace occa {\ntemplate <class entry_t>\nvoid ring_t<entry_t>::addRef(entry_t *entry) {\n- if (!entry) {\n+ if (!entry || head == entry) {\nreturn;\n}\nentry->removeRef();\n@@ -37,12 +37,15 @@ namespace occa {\ntemplate <class entry_t>\nvoid ring_t<entry_t>::removeRef(entry_t *entry) {\n+ // Check if the ring is empty\nif (!entry || !head) {\nreturn;\n}\nringEntry_t *tail = head->leftRingEntry;\n+ // Remove the entry ref from its ring\nentry->removeRef();\nif (head == entry) {\n+ // Change the head to the tail if entry happened to be the old head\nhead = ((tail != entry)\n? tail\n: NULL);\n@@ -51,9 +54,25 @@ namespace occa {\ntemplate <class entry_t>\nbool ring_t<entry_t>::needsFree() const {\n+ // Object has no more references, safe to free now\nreturn useRefs && (head == NULL);\n}\n+ template <class entry_t>\n+ int ring_t<entry_t>::length() const {\n+ if (!head) {\n+ return 0;\n+ }\n+\n+ ringEntry_t *ptr = head->rightRingEntry;\n+ int count = 1;\n+ while (ptr != head) {\n+ ++count;\n+ ptr = ptr->rightRingEntry;\n+ }\n+ return count;\n+ }\n+\n//---[ multiRing_t ]----------------\ntemplate <class entry_t>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/kernel.cpp",
"new_path": "src/core/kernel.cpp",
"diff": "@@ -24,9 +24,9 @@ namespace occa {\nmodeKernel_t::~modeKernel_t() {\n// NULL all wrappers\nwhile (kernelRing.head) {\n- kernel *mem = (kernel*) kernelRing.head;\n- kernelRing.removeRef(mem);\n- mem->modeKernel = NULL;\n+ kernel *k = (kernel*) kernelRing.head;\n+ kernelRing.removeRef(k);\n+ k->modeKernel = NULL;\n}\n// Remove ref from device\nif (modeDevice) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/kernelBuilder.cpp",
"new_path": "src/core/kernelBuilder.cpp",
"diff": "@@ -116,6 +116,7 @@ namespace occa {\nit->second.free();\n++it;\n}\n+ kernelMap.clear();\n}\n//====================================\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/launchedDevice.cpp",
"new_path": "src/core/launchedDevice.cpp",
"diff": "@@ -72,7 +72,14 @@ namespace occa {\nstd::vector<modeKernel_t*> &deviceKernels = kernel->deviceKernels;\nconst int kernelCount = (int) deviceKernels.size();\nfor (int i = 0; i < kernelCount; ++i) {\n- deviceKernels[i]->properties[\"type_validation\"] = false;\n+ modeKernel_t *deviceKernel = deviceKernels[i];\n+\n+ // The launchedKernel handles deleting the launcher + device kernels\n+ removeKernelRef(deviceKernel);\n+ deviceKernel->dontUseRefs();\n+\n+ // Some backends inject additional arguments\n+ deviceKernel->properties[\"type_validation\"] = false;\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/launchedKernel.cpp",
"new_path": "src/core/launchedKernel.cpp",
"diff": "@@ -17,7 +17,7 @@ namespace occa {\ndelete launcherKernel;\nlauncherKernel = NULL;\n- int kernelCount = (int) deviceKernels.size();\n+ const int kernelCount = (int) deviceKernels.size();\nfor (int i = 0; i < kernelCount; ++i) {\ndelete deviceKernels[i];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/device.cpp",
"new_path": "src/modes/cuda/device.cpp",
"diff": "@@ -374,7 +374,6 @@ namespace occa {\ncuModule,\ncuFunction,\nkernelProps);\n- cuKernel->dontUseRefs();\ncuKernel->metadata = metadata;\nk.deviceKernels.push_back(cuKernel);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/hip/device.cpp",
"new_path": "src/modes/hip/device.cpp",
"diff": "@@ -351,7 +351,6 @@ namespace occa {\nhipModule,\nhipFunction,\nkernelProps);\n- hipKernel->dontUseRefs();\nhipKernel->metadata = metadata;\nk.deviceKernels.push_back(hipKernel);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/metal/device.cpp",
"new_path": "src/modes/metal/device.cpp",
"diff": "@@ -236,7 +236,6 @@ namespace occa {\nmetalDevice,\nmetalFunction,\nkernelProps);\n- deviceKernel->dontUseRefs();\ndeviceKernel->metadata = metadata;\nk.deviceKernels.push_back(deviceKernel);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/opencl/device.cpp",
"new_path": "src/modes/opencl/device.cpp",
"diff": "@@ -280,7 +280,6 @@ namespace occa {\nclDevice,\nclInfo.clKernel,\nkernelProps);\n- clKernel->dontUseRefs();\nclKernel->metadata = metadata;\nk.deviceKernels.push_back(clKernel);\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[GC] Fixes refs on launched kernels (#293)
|
378,349 |
16.03.2020 22:06:59
| 14,400 |
acaa017211cc375929a03e63d80868df2a79a7d7
|
[CUDA] Adds pseudo-NULL pointer
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/modes/cuda/device.hpp",
"new_path": "include/occa/modes/cuda/device.hpp",
"diff": "namespace occa {\nnamespace cuda {\nclass kernel;\n+ class memory;\nclass device : public occa::launchedModeDevice_t {\nfriend class kernel;\n@@ -16,6 +17,9 @@ namespace occa {\nprivate:\nmutable hash_t hash_;\n+ // We can't pass null, so we reuse a 1-byte buffer instead\n+ memory *nullPtr;\n+\npublic:\nint archMajorVersion, archMinorVersion;\nbool p2pEnabled;\n@@ -36,6 +40,8 @@ namespace occa {\nvirtual lang::okl::withLauncher* createParser(const occa::properties &props) const;\n+ void* getNullPtr();\n+\n//---[ Stream ]-------------------\nvirtual modeStream_t* createStream(const occa::properties &props);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/core/kernelArg.cpp",
"new_path": "src/core/kernelArg.cpp",
"diff": "@@ -44,7 +44,14 @@ namespace occa {\n}\nvoid* kernelArgData::ptr() const {\n- return ((info & kArgInfo::usePointer) ? data.void_ : (void*) &data);\n+ if (!isNull()) {\n+ if (info & kArgInfo::usePointer) {\n+ return data.void_;\n+ } else {\n+ return (void*) &data;\n+ }\n+ }\n+ return NULL;\n}\nbool kernelArgData::isNull() const {\n@@ -84,7 +91,11 @@ namespace occa {\ntemplate <>\nkernelArg::kernelArg(modeMemory_t *arg) {\n+ if (arg) {\nadd(arg->makeKernelArg());\n+ } else {\n+ add(kernelArg(nullKernelArg));\n+ }\n}\ntemplate <>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/device.cpp",
"new_path": "src/modes/cuda/device.cpp",
"diff": "namespace occa {\nnamespace cuda {\ndevice::device(const occa::properties &properties_) :\n- occa::launchedModeDevice_t(properties_) {\n+ occa::launchedModeDevice_t(properties_),\n+ nullPtr(NULL) {\nif (!properties.has(\"wrapped\")) {\nOCCA_ERROR(\"[CUDA] device not given a [device_id] integer\",\n@@ -113,6 +114,14 @@ namespace occa {\nreturn new lang::okl::cudaParser(props);\n}\n+ void* device::getNullPtr() {\n+ if (!nullPtr) {\n+ // Auto freed through ring garbage collection\n+ nullPtr = (cuda::memory*) malloc(1, NULL, occa::properties());\n+ }\n+ return (void*) &(nullPtr->cuPtr);\n+ }\n+\n//---[ Stream ]---------------------\nmodeStream_t* device::createStream(const occa::properties &props) {\nCUstream cuStream;\n@@ -406,7 +415,6 @@ namespace occa {\nmodeMemory_t* device::malloc(const udim_t bytes,\nconst void *src,\nconst occa::properties &props) {\n-\nif (props.get(\"mapped\", false)) {\nreturn mappedAlloc(bytes, src, props);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/modes/cuda/kernel.cpp",
"new_path": "src/modes/cuda/kernel.cpp",
"diff": "@@ -70,6 +70,10 @@ namespace occa {\n// Set arguments\nfor (int i = 0; i < args; ++i) {\nvArgs[i] = arguments[i].ptr();\n+ // Set a proper NULL pointer\n+ if (!vArgs[i]) {\n+ vArgs[i] = ((device*) modeDevice)->getNullPtr();\n+ }\n}\nOCCA_CUDA_ERROR(\"Launching Kernel\",\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[CUDA] Adds pseudo-NULL pointer (#295)
|
378,349 |
23.03.2020 09:58:05
| 14,400 |
2ae4ae80a4db29ffc27072d2df837ffe1f885673
|
[C] Allows occaNull to be passed to kernels
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/c/types.hpp",
"new_path": "include/occa/c/types.hpp",
"diff": "@@ -8,36 +8,37 @@ namespace occa {\nnamespace typeType {\nstatic const int undefined = 0;\nstatic const int default_ = 1;\n-\n- static const int ptr = 2;\n-\n- static const int bool_ = 3;\n-\n- static const int int8_ = 4;\n- static const int uint8_ = 5;\n- static const int int16_ = 6;\n- static const int uint16_ = 7;\n- static const int int32_ = 8;\n- static const int uint32_ = 9;\n- static const int int64_ = 10;\n- static const int uint64_ = 11;\n- static const int float_ = 12;\n- static const int double_ = 13;\n-\n- static const int struct_ = 14;\n- static const int string = 15;\n-\n- static const int device = 16;\n- static const int kernel = 17;\n- static const int kernelBuilder = 18;\n- static const int memory = 19;\n- static const int stream = 20;\n- static const int streamTag = 21;\n-\n- static const int dtype = 22;\n- static const int scope = 23;\n- static const int json = 24;\n- static const int properties = 25;\n+ static const int null_ = 2;\n+\n+ static const int ptr = 3;\n+\n+ static const int bool_ = 4;\n+\n+ static const int int8_ = 5;\n+ static const int uint8_ = 6;\n+ static const int int16_ = 7;\n+ static const int uint16_ = 8;\n+ static const int int32_ = 9;\n+ static const int uint32_ = 10;\n+ static const int int64_ = 11;\n+ static const int uint64_ = 12;\n+ static const int float_ = 13;\n+ static const int double_ = 14;\n+\n+ static const int struct_ = 15;\n+ static const int string = 16;\n+\n+ static const int device = 17;\n+ static const int kernel = 18;\n+ static const int kernelBuilder = 19;\n+ static const int memory = 20;\n+ static const int stream = 21;\n+ static const int streamTag = 22;\n+\n+ static const int dtype = 23;\n+ static const int scope = 24;\n+ static const int json = 25;\n+ static const int properties = 26;\n}\noccaType defaultOccaType();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/c/kernel.cpp",
"new_path": "src/c/kernel.cpp",
"diff": "@@ -97,9 +97,13 @@ void OCCA_RFUNC occaKernelSetRunDims(occaKernel kernel,\nOCCA_LFUNC void OCCA_RFUNC occaKernelPushArg(occaKernel kernel,\noccaType arg) {\n+ if (&arg != &occaNull) {\nocca::c::kernel(kernel).pushArg(\nocca::c::kernelArg(arg)\n);\n+ } else {\n+ occa::c::kernel(kernel).pushArg(occa::null);\n+ }\n}\nOCCA_LFUNC void OCCA_RFUNC occaKernelClearArgs(occaKernel kernel) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/c/types.cpp",
"new_path": "src/c/types.cpp",
"diff": "@@ -32,6 +32,15 @@ namespace occa {\nreturn oType;\n}\n+ occaType nullOccaType() {\n+ occaType oType;\n+ oType.magicHeader = OCCA_C_TYPE_MAGIC_HEADER;\n+ oType.type = occa::c::typeType::null_;\n+ oType.value.ptr = NULL;\n+ oType.needsFree = false;\n+ return oType;\n+ }\n+\noccaType newOccaType(void *value) {\noccaType oType;\noType.magicHeader = OCCA_C_TYPE_MAGIC_HEADER;\n@@ -429,6 +438,9 @@ namespace occa {\ncase occa::c::typeType::memory: {\nreturn occa::kernelArg(occa::c::memory(value));\n}\n+ case occa::c::typeType::null_: {\n+ return occa::kernelArg(occa::null);\n+ }\ndefault:\nOCCA_FORCE_ERROR(\"An invalid occaType or non-occaType argument was passed\");\n}\n@@ -593,6 +605,7 @@ OCCA_START_EXTERN_C\n//---[ Type Flags ]---------------------\nconst int OCCA_UNDEFINED = occa::c::typeType::undefined;\nconst int OCCA_DEFAULT = occa::c::typeType::default_;\n+const int OCCA_NULL = occa::c::typeType::null_;\nconst int OCCA_PTR = occa::c::typeType::ptr;\n@@ -626,9 +639,9 @@ const int OCCA_PROPERTIES = occa::c::typeType::properties;\n//======================================\n//---[ Globals & Flags ]----------------\n-const occaType occaNull = occa::c::newOccaType((void*) NULL);\nconst occaType occaUndefined = occa::c::undefinedOccaType();\nconst occaType occaDefault = occa::c::defaultOccaType();\n+const occaType occaNull = occa::c::nullOccaType();\nconst occaUDim_t occaAllBytes = -1;\n//======================================\n@@ -638,6 +651,10 @@ OCCA_LFUNC int OCCA_RFUNC occaIsUndefined(occaType value) {\n(value.magicHeader != OCCA_C_TYPE_MAGIC_HEADER));\n}\n+OCCA_LFUNC int OCCA_RFUNC occaIsNull(occaType value) {\n+ return (value.type == occa::c::typeType::null_);\n+}\n+\nOCCA_LFUNC int OCCA_RFUNC occaIsDefault(occaType value) {\nreturn (value.type == occa::c::typeType::default_);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/files/argKernel.okl",
"new_path": "tests/files/argKernel.okl",
"diff": "-@kernel void argKernel(char *mem,\n+@kernel void argKernel(void *null,\n+ char *mem,\nchar *uvaPtr,\n- void *null,\nint i8,\nint u8,\nint i16,\nfor (int i = 0; i < 1; ++i; @tile(1, @outer, @inner)) {\n// Note: NULL is not 0 because some backends don't handle NULL arguments properly\nprintf(\n+ \"null: %p\\n\"\n\"mem: %d\\n\"\n\"uvaPtr: %d\\n\"\n- \"null: %p\\n\"\n\"i8: %d\\n\"\n\"u8: %d\\n\"\n\"i16: %d\\n\"\n\"d: %f\\n\"\n\"xy: [%d, %d]\\n\"\n\"str: %s\\n\",\n- mem[0],\n- uvaPtr[0],\nnull,\n+ (int) mem[0],\n+ (int) uvaPtr[0],\n(int) i8,\n(int) u8,\n(int) i16,\nxy[0], xy[1],\nstr\n);\n+ if (i8 != 2) {\n+ throw 1;\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/src/c/kernel.cpp",
"new_path": "tests/src/c/kernel.cpp",
"diff": "@@ -114,7 +114,8 @@ void testRun() {\n// Good argument types\noccaKernelRunN(\n- argKernel, 14,\n+ argKernel, 15,\n+ occaNull,\nmem,\noccaPtr(uvaPtr),\noccaInt8(2),\n@@ -133,6 +134,7 @@ void testRun() {\n// Manual argument insertion\noccaKernelClearArgs(argKernel);\n+ occaKernelPushArg(argKernel, occaNull);\noccaKernelPushArg(argKernel, mem);\noccaKernelPushArg(argKernel, occaPtr(uvaPtr));\noccaKernelPushArg(argKernel, occaInt8(2));\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[C] Allows occaNull to be passed to kernels (#302)
|
378,349 |
24.03.2020 03:41:18
| 14,400 |
ac5a352fc69070637ef9d231829951021f278f81
|
[Preprocessor] Stringifies tokens inside concat
|
[
{
"change_type": "MODIFY",
"old_path": "include/occa/lang/macro.hpp",
"new_path": "include/occa/lang/macro.hpp",
"diff": "@@ -47,6 +47,8 @@ namespace occa {\nvirtual bool expand(tokenVector &newTokens,\ntoken_t *source,\nstd::vector<tokenVector> &args) = 0;\n+\n+ void expandDefinedTokens(tokenVector &tokens);\n};\nclass macroRawToken : public macroToken {\n"
},
{
"change_type": "MODIFY",
"old_path": "include/occa/lang/preprocessor.hpp",
"new_path": "include/occa/lang/preprocessor.hpp",
"diff": "@@ -65,6 +65,9 @@ namespace occa {\n//================================\n//---[ Misc ]---------------------\n+ tokenizer_t *tokenizer;\n+ bool hasLoadedTokenizer;\n+\nstrVector includePaths;\n//================================\n@@ -118,6 +121,14 @@ namespace occa {\nstrVector getDependencyFilenames() const;\n//================================\n+ void loadTokenizer();\n+\n+ bool expandDefinedToken(token_t *token,\n+ tokenVector &outputTokens);\n+\n+ void expandDefinedTokens(tokenVector &inputTokens,\n+ tokenVector &outputTokens);\n+\nvoid expandMacro(identifierToken &source,\nmacro_t ¯o);\nvoid clearExpandedMacros(token_t *token);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/lang/macro.cpp",
"new_path": "src/lang/macro.cpp",
"diff": "@@ -60,6 +60,17 @@ namespace occa {\nreturn newToken;\n}\n+ void macroToken::expandDefinedTokens(tokenVector &tokens) {\n+ tokenVector expandedTokens;\n+ pp.expandDefinedTokens(tokens, expandedTokens);\n+\n+ // Update tokens with expanded tokens\n+ tokens.swap(expandedTokens);\n+\n+ // Free old tokens\n+ freeTokenVector(expandedTokens);\n+ }\n+\nmacroRawToken::macroRawToken(preprocessor_t &pp_,\ntoken_t *thisToken_) :\nmacroToken(pp_, thisToken_) {}\n@@ -144,6 +155,9 @@ namespace occa {\nreturn false;\n}\n+ // Make sure to expand defined variables\n+ expandDefinedTokens(stringTokens);\n+\nconst std::string rawValue = stringifyTokens(stringTokens, true);\n// Escape double quotes\n@@ -200,6 +214,9 @@ namespace occa {\n}\n}\n+ // Make sure to expand defined variables\n+ expandDefinedTokens(concatTokens);\n+\n// Combine tokens to create one token identifier\nconst std::string concatValue = stringifyTokens(concatTokens, false);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/lang/preprocessor.cpp",
"new_path": "src/lang/preprocessor.cpp",
"diff": "@@ -91,6 +91,9 @@ namespace occa {\nwarnings = 0;\nerrors = 0;\n+\n+ tokenizer = NULL;\n+ hasLoadedTokenizer = false;\n}\nvoid preprocessor_t::clear() {\n@@ -102,6 +105,9 @@ namespace occa {\nerrors = 0;\nwarnings = 0;\n+ tokenizer = NULL;\n+ hasLoadedTokenizer = false;\n+\nwhile (inputCache.size()) {\ndelete inputCache.front();\ninputCache.pop_front();\n@@ -329,10 +335,50 @@ namespace occa {\n}\n//==================================\n+ void preprocessor_t::loadTokenizer() {\n+ if (!hasLoadedTokenizer) {\n+ tokenizer = (tokenizer_t*) getInput(\"tokenizer_t\");\n+ hasLoadedTokenizer = true;\n+ }\n+ }\n+\n+\n+ bool preprocessor_t::expandDefinedToken(token_t *token, tokenVector &tokens) {\n+ if (!(token_t::safeType(token) & tokenType::identifier)) {\n+ return false;\n+ }\n+\n+ identifierToken &idToken = token->to<identifierToken>();\n+ macro_t *macro = getMacro(idToken.value);\n+ if (!macro) {\n+ return false;\n+ }\n+\n+ macro->expand(tokens, idToken);\n+ return true;\n+ }\n+\n+ void preprocessor_t::expandDefinedTokens(tokenVector &inputTokens,\n+ tokenVector &outputTokens) {\n+ const int inputTokenCount = (int) inputTokens.size();\n+ for (int i = 0; i < inputTokenCount; ++i) {\n+ token_t *token = inputTokens[i];\n+ tokenVector expandedTokens;\n+\n+ if (expandDefinedToken(token, expandedTokens)) {\n+ const int expandedTokenCount = (int) expandedTokens.size();\n+ for (int j = 0; j < expandedTokenCount; ++j) {\n+ outputTokens.push_back(expandedTokens[j]);\n+ }\n+ } else {\n+ outputTokens.push_back(token->clone());\n+ }\n+ }\n+ }\n+\nvoid preprocessor_t::expandMacro(identifierToken &source,\nmacro_t ¯o) {\ntokenVector tokens;\n-\nmacro.expand(tokens, source);\nconst int tokenCount = (int) tokens.size();\n@@ -518,7 +564,6 @@ namespace occa {\n);\n}\n-\nvoid preprocessor_t::processIdentifier(identifierToken &token) {\n// Ignore tokens inside disabled #if/#elif/#else regions\nif (status & ppStatus::ignoring) {\n@@ -649,7 +694,7 @@ namespace occa {\noutputCache.clear();\n// Make sure we have a tokenizer\n- tokenizer_t *tokenizer = (tokenizer_t*) getInput(\"tokenizer_t\");\n+ loadTokenizer();\nif (!tokenizer) {\nwarningOn(directiveToken,\n\"Unable to apply @directive due to the lack of a tokenizer\");\n@@ -1103,7 +1148,7 @@ namespace occa {\nvoid preprocessor_t::processInclude(identifierToken &directive) {\n// Don't cache since the input might change\n- tokenizer_t *tokenizer = (tokenizer_t*) getInput(\"tokenizer_t\");\n+ loadTokenizer();\nif (!tokenizer) {\nwarningOn(&directive,\n\"Unable to apply #include due to the lack of a tokenizer\");\n@@ -1213,10 +1258,7 @@ namespace occa {\ngetExpandedLineTokens(lineTokens);\n// Don't cache since the input might change\n- tokenizer_t *tokenizer = (tokenizer_t*) getInput(\"tokenizer_t\");\n- if (!tokenizer) {\n- tokenizer = (tokenizer_t*) getInput(\"tokenizer_t\");\n- }\n+ loadTokenizer();\nif (!tokenizer) {\nwarningOn(&directive,\n\"Unable to apply #line due to the lack of a tokenizer\");\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/src/lang/preprocessor.cpp",
"new_path": "tests/src/lang/preprocessor.cpp",
"diff": "@@ -145,6 +145,7 @@ void testMacroDefines() {\n// Make sure we can handle recursive macros\n#define identifier (token->to<identifierToken>().value)\n+#define stringValue (token->to<stringToken>().value)\nsetStream(\n\"#define foo foo\\n\"\n\"foo\"\n@@ -168,6 +169,17 @@ void testMacroDefines() {\nASSERT_EQ(\"foo2\",\nidentifier);\n+ // Test concat with defines\n+ setStream(\n+ \"#define ONE 1\\n\"\n+ \"#define TWO 2\\n\"\n+ \"#define ONE_TWO_FUNC(FUNC) FUNC ## _ ## ONE ## _ ## TWO\\n\"\n+ \"ONE_TWO_FUNC(hi)\\n\"\n+ );\n+ getToken();\n+ ASSERT_EQ(\"hi_1_2\",\n+ identifier);\n+\n#undef identifier\n}\n"
}
] |
C++
|
MIT License
|
libocca/occa
|
[Preprocessor] Stringifies tokens inside concat (#303)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.