Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Add kernel/include_occa and kernel/link_occa properties #675

Merged
merged 1 commit into from Jul 21, 2023
Merged

Add kernel/include_occa and kernel/link_occa properties #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/cpp/18_nonblocking_streams/main.cpp
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@ int main(int argc, const char **argv) {
occa::json kernelProps({
{"defines/block", block},
{"defines/group", group},
{"serial/include_std", true},
});
occa::kernel powerOfPi = occa::buildKernel("powerOfPi.okl",
"powerOfPi",
Expand Down
2 changes: 2 additions & 0 deletions src/loops/typelessForLoop.cpp
View file
Open in desktop
Expand Up @@ -34,6 +34,8 @@ namespace occa {
loopScope.device = device;
}

loopScope.props["kernel/include_occa"] = true;

const int outerIterationCount = (int) outerIterations.size();
const int innerIterationCount = (int) innerIterations.size();

Expand Down
11 changes: 8 additions & 3 deletions src/occa/internal/lang/modes/serial.cpp
View file
Open in desktop
Expand Up @@ -34,8 +34,11 @@ namespace occa {

void serialParser::setupHeaders() {
strVector headers;
const bool includingStd = settings.get("serial/include_std", true);
headers.push_back("include <occa.hpp>\n");
const bool includeOcca = settings.get("kernel/include_occa", false);
if (includeOcca) {
headers.push_back("include <occa.hpp>\n");
}
const bool includingStd = settings.get("serial/include_std", false);
if (includingStd) {
headers.push_back("include <stdint.h>");
headers.push_back("include <cstdlib>");
Expand All @@ -51,7 +54,9 @@ namespace occa {
if (includingStd) {
header += "\nusing namespace std;";
}
header += "\nusing namespace occa;";
if (includeOcca) {
header += "\nusing namespace occa;";
}
}
directiveToken token(root.source->origin,
header);
Expand Down
19 changes: 14 additions & 5 deletions src/occa/internal/modes/cuda/device.cpp
View file
Open in desktop
Expand Up @@ -91,7 +91,8 @@ namespace occa {
return (
occa::hash(props["compiler"])
^ props["compiler_flags"]
^ props["compiler_env_script"]
^ props["kernel/include_occa"]
^ props["kernel/link_occa"]
);
}

Expand Down Expand Up @@ -273,6 +274,9 @@ namespace occa {
sys::addCompilerLibraryFlags(compilerFlags);
}

const bool includeOcca = kernelProps.get("kernel/include_occa", false);
const bool linkOcca = kernelProps.get("kernel/link_occa", false);

//---[ Compiling Command ]--------
std::stringstream command;
command << allProps["compiler"]
Expand All @@ -281,10 +285,15 @@ namespace occa {
#if (OCCA_OS == OCCA_WINDOWS_OS)
<< " -D OCCA_OS=OCCA_WINDOWS_OS -D _MSC_VER=1800"
#endif
<< " -I" << env::OCCA_DIR << "include"
<< " -I" << env::OCCA_INSTALL_DIR << "include"
<< " -L" << env::OCCA_INSTALL_DIR << "lib -locca"
<< " -x cu " << sourceFilename
;
if (includeOcca) {
command << " -I" << env::OCCA_DIR << "include"
<< " -I" << env::OCCA_INSTALL_DIR << "include";
}
if (linkOcca) {
command << " -L" << env::OCCA_INSTALL_DIR << "lib -locca";
}
command << " -x cu " << sourceFilename
<< " -o " << binaryFilename
<< " 2>&1";

Expand Down
16 changes: 15 additions & 1 deletion src/occa/internal/modes/dpcpp/device.cpp
View file
Open in desktop
Expand Up @@ -73,7 +73,11 @@ namespace occa
hash_t device::kernelHash(const occa::json &props) const
{
return (
occa::hash(props["compiler"]) ^ props["compiler_flags"]);
occa::hash(props["compiler"])
^ props["compiler_flags"]
^ props["kernel/include_occa"]
^ props["kernel/link_occa"]
);
}

lang::okl::withLauncher *device::createParser(const occa::json &props) const
Expand Down Expand Up @@ -199,6 +203,16 @@ namespace occa
sys::addCompilerLibraryFlags(compilerFlags);
}

const bool includeOcca = kernelProps.get("kernel/include_occa", false);
const bool linkOcca = kernelProps.get("kernel/link_occa", false);
if (includeOcca) {
compilerFlags += " -I" + env::OCCA_DIR + "include";
compilerFlags += " -I" + env::OCCA_INSTALL_DIR + "include";
}
if (linkOcca) {
compilerLinkerFlags += " -L" + env::OCCA_INSTALL_DIR + "lib -locca";
}

std::stringstream command;
if (allProps.has("compiler_env_script"))
{
Expand Down
21 changes: 15 additions & 6 deletions src/occa/internal/modes/hip/device.cpp
View file
Open in desktop
Expand Up @@ -81,6 +81,9 @@ namespace occa {
occa::hash(props["compiler"])
^ props["compiler_flags"]
^ props["compiler_env_script"]
^ props["hipcc_compiler_flags"]
^ props["kernel/include_occa"]
^ props["kernel/link_occa"]
);
}

Expand Down Expand Up @@ -276,14 +279,20 @@ namespace occa {
#else
<< " -f=\\\"" << compilerFlags << "\\\""
#endif
<< ' ' << hipccCompilerFlags
<< ' ' << hipccCompilerFlags;
#if defined(__HIP_PLATFORM_NVCC___) || (HIP_VERSION >= 305)
<< " -I" << env::OCCA_DIR << "include"
<< " -I" << env::OCCA_INSTALL_DIR << "include"
const bool includeOcca = kernelProps.get("kernel/include_occa", false);
const bool linkOcca = kernelProps.get("kernel/link_occa", false);
if (includeOcca) {
command << " -I" << env::OCCA_DIR << "include"
<< " -I" << env::OCCA_INSTALL_DIR << "include";
}
if (linkOcca) {
/* NC: hipcc doesn't seem to like linking a library in */
//<< " -L" << env::OCCA_INSTALL_DIR << "lib -locca";
}
#endif
/* NC: hipcc doesn't seem to like linking a library in */
//<< " -L" << env::OCCA_INSTALL_DIR << "lib -locca"
<< ' ' << sourceFilename
command << ' ' << sourceFilename
<< " -o " << binaryFilename
<< " 2>&1";

Expand Down
17 changes: 16 additions & 1 deletion src/occa/internal/modes/opencl/device.cpp
View file
Open in desktop
Expand Up @@ -55,6 +55,17 @@ namespace occa {
}
compilerFlags += " -cl-std=CL" + ocl_c_ver;

const bool includeOcca = kernelProps.get("kernel/include_occa", false);
const bool linkOcca = kernelProps.get("kernel/link_occa", false);

if (includeOcca) {
compilerFlags += " -I" + env::OCCA_DIR + "include";
compilerFlags += " -I" + env::OCCA_INSTALL_DIR + "include";
}
if (linkOcca) {
compilerFlags += " -L" + env::OCCA_INSTALL_DIR + "lib -locca";
}

kernelProps["compiler_flags"] = compilerFlags;

arch = deviceName(platformID, deviceID);
Expand Down Expand Up @@ -87,7 +98,11 @@ namespace occa {
}

hash_t device::kernelHash(const occa::json &props) const {
return occa::hash(props["compiler_flags"]);
return (
occa::hash(props["compiler_flags"])
^ props["kernel/include_occa"]
^ props["kernel/link_occa"]
);
}

lang::okl::withLauncher* device::createParser(const occa::json &props) const {
Expand Down
35 changes: 24 additions & 11 deletions src/occa/internal/modes/serial/device.cpp
View file
Open in desktop
Expand Up @@ -39,6 +39,8 @@ namespace occa {
^ props["compiler_language"]
^ props["compiler_linker_flags"]
^ props["compiler_shared_flags"]
^ props["include_occa"]
^ props["link_occa"]
);
}

Expand Down Expand Up @@ -318,6 +320,9 @@ namespace occa {
sys::addCompilerLibraryFlags(compilerFlags);
}

const bool includeOcca = kernelProps.get("kernel/include_occa", isLauncherKernel);
const bool linkOcca = kernelProps.get("kernel/link_occa", isLauncherKernel);

io::stageFile(
binaryFilename,
true,
Expand All @@ -326,11 +331,15 @@ namespace occa {
command << compiler
<< ' ' << compilerFlags
<< ' ' << sourceFilename
<< " -o " << tempFilename
<< " -I" << env::OCCA_DIR << "include"
<< " -I" << env::OCCA_INSTALL_DIR << "include"
<< " -L" << env::OCCA_INSTALL_DIR << "lib -locca"
<< ' ' << compilerLinkerFlags
<< " -o " << tempFilename;
if (includeOcca) {
command << " -I" << env::OCCA_DIR << "include"
<< " -I" << env::OCCA_INSTALL_DIR << "include";
}
if (linkOcca) {
command << " -L" << env::OCCA_INSTALL_DIR << "lib -locca";
}
command << ' ' << compilerLinkerFlags
<< " 2>&1"
<< std::endl;
#else
Expand All @@ -339,12 +348,16 @@ namespace occa {
<< " /D OCCA_OS=OCCA_WINDOWS_OS"
<< " /EHsc"
<< " /wd4244 /wd4800 /wd4804 /wd4018"
<< ' ' << compilerFlags
<< " /I" << env::OCCA_DIR << "include"
<< " /I" << env::OCCA_INSTALL_DIR << "include"
<< ' ' << sourceFilename
<< " /link " << env::OCCA_INSTALL_DIR << "lib/libocca.lib",
<< ' ' << compilerLinkerFlags
<< ' ' << compilerFlags;
if (includeOcca) {
command << " /I" << env::OCCA_DIR << "include"
<< " /I" << env::OCCA_INSTALL_DIR << "include";
}
command << ' ' << sourceFilename;
if (linkOcca) {
command << " /link " << env::OCCA_INSTALL_DIR << "lib/libocca.lib";
}
command << ' ' << compilerLinkerFlags
<< " /OUT:" << tempFilename
<< std::endl;
#endif
Expand Down
2 changes: 1 addition & 1 deletion tests/src/c/kernel.cpp
View file
Open in desktop
Expand Up @@ -87,7 +87,7 @@ void testRun() {
occa::env::OCCA_DIR + "tests/files/argKernel.okl"
);
occaJson kernelProps = occaJsonParse(
"{type_validation: false}"
"{type_validation: false, serial: {include_std: true}}"
);
occaKernel argKernel = (
occaBuildKernel(argKernelFile.c_str(),
Expand Down
3 changes: 2 additions & 1 deletion tests/src/core/kernel.cpp
View file
Open in desktop
Expand Up @@ -154,7 +154,8 @@ void testRun() {
);
occa::kernel argKernel = occa::buildKernel(argKernelFile,
"argKernel",
{{"type_validation", false}});
{{"type_validation", false},
{"serial/include_std", true}});

argKernel.setRunDims(occa::dim(1, 1, 1),
occa::dim(1, 1, 1));
Expand Down
27 changes: 15 additions & 12 deletions tests/src/math/fpMath.cpp
View file
Open in desktop
Expand Up @@ -55,45 +55,48 @@ std::string kernel_back_half =

void testUnaryFunctions(const occa::device& d) {
for (auto fp_type : arg_types) {
std::string arg_decl =
std::string arg_decl =
" " + fp_type + " " + unary_args + ";\n";
for(auto func : unary_functions) {
std::string function_call =
std::string function_call =
" " + fp_type + " w = " + func + "(" + unary_args + ");\n";
std::string kernel_src =
std::string kernel_src =
kernel_front_half + arg_decl + function_call +kernel_back_half;

occa::kernel k = d.buildKernelFromString(kernel_src,"f");
occa::kernel k = d.buildKernelFromString(kernel_src, "f",
{{"serial/include_std", true}});
}
}
}

void testBinaryFunctions(const occa::device& d) {
for (auto fp_type : arg_types) {
std::string arg_decl =
std::string arg_decl =
" " + fp_type + " " + binary_args + ";\n";
for(auto func : binary_functions) {
std::string function_call =
std::string function_call =
" " + fp_type + " w = " + func + "(" + binary_args + ");\n";
std::string kernel_src =
std::string kernel_src =
kernel_front_half + arg_decl + function_call +kernel_back_half;

occa::kernel k = d.buildKernelFromString(kernel_src,"f");
occa::kernel k = d.buildKernelFromString(kernel_src, "f",
{{"serial/include_std", true}});
}
}
}

void testTernaryFunctions(const occa::device& d) {
for (auto fp_type : arg_types) {
std::string arg_decl =
std::string arg_decl =
" " + fp_type + " " + ternary_args + ";\n";
for(auto func : ternary_functions) {
std::string function_call =
std::string function_call =
" " + fp_type + " w = " + func + "(" + ternary_args + ");\n";
std::string kernel_src =
std::string kernel_src =
kernel_front_half + arg_decl + function_call +kernel_back_half;

occa::kernel k = d.buildKernelFromString(kernel_src,"f");
occa::kernel k = d.buildKernelFromString(kernel_src, "f",
{{"serial/include_std", true}});
}
}
}
Expand Down
19 changes: 11 additions & 8 deletions tests/src/math/intMath.cpp
View file
Open in desktop
Expand Up @@ -29,30 +29,33 @@ std::string kernel_back_half =

void testUnaryFunctions(const occa::device& d) {
for (auto&& int_type : arg_types) {
const std::string arg_decl =
const std::string arg_decl =
" " + int_type + " " + unary_args + "; \n";
for (auto&& func : unary_functions) {
const std::string function_call =
const std::string function_call =
" " + int_type + " w = " + func + "(" + unary_args + "); \n";
const std::string kernel_src =
const std::string kernel_src =
kernel_front_half + arg_decl + function_call +kernel_back_half;

occa::kernel k = d.buildKernelFromString(kernel_src,"f");
occa::kernel k = d.buildKernelFromString(kernel_src, "f",
{{"serial/include_std", true}});
}
}
}

void testBinaryFunctions(const occa::device& d) {
for (auto&& int_type : arg_types) {
const std::string arg_decl =
const std::string arg_decl =
" " + int_type + " " + binary_args + "; \n";
for (auto&& func : binary_functions) {
const std::string function_call =
const std::string function_call =
" " + int_type + " w = " + func + "(" + binary_args + "); \n";
const std::string kernel_src =
const std::string kernel_src =
kernel_front_half + arg_decl + function_call +kernel_back_half;

occa::kernel k = d.buildKernelFromString(kernel_src,"f");
occa::kernel k = d.buildKernelFromString(kernel_src, "f",
{{"serial/include_std", true},
{"kernel/include_occa", true}}); // For min/max
}
}
}
Expand Down