Fix marshalling of bool flags in MF#3210

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

Merged
wschin merged 3 commits into from
Apr 5, 2019
Merged

Fix marshalling of bool flags in MF #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c8090c
Fix marshalling of bool flags in MF
wschin Apr 5, 2019
fbbc121
Address comment
wschin Apr 5, 2019
1bcdc54
Better type of C# and C bool bridge
wschin Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Microsoft.ML.Recommender/SafeTrainingAndModelBuffer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,19 +133,19 @@ private struct MFParameter
/// Specify if the factor matrices should be non-negative.
/// </summary>
[FieldOffset(48)]
public int DoNmf;
public byte DoNmf;

@eerhardteerhardtApr 5, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

While this is better than what we had before, this is still not correct.

https://docs.microsoft.com/en-us/cpp/cpp/fundamental-types-cpp?view=vs-2019

bool Type bool is an integral type that can have one of the two values true or false. Its size is unspecified.

https://en.cppreference.com/w/cpp/language/types

bool - type, capable of holding one of the two values: true or false. The value of sizeof(bool) is implementation defined and might differ from 1.

Instead, to make interop/marshalling work correctly on all computers - the technique we use in .NET is to ensure the ABI (application binary interface) is stable no matter the compiler/processor/etc. This means only stable-sized types can be used in the ABI that C# code P/Invokes into.

So to fix this, the libmf C code should change to have a stable ABI. I see it uses float, int, and bool. For sure int and bool can change sizes depending on the compiler/processor. Instead, we should be using int32_t and int8_t on the C side. (Note: you can just have a wrapper export function in the C library that exposes the stable ABI and calls into your current code. So the main C/C++ code can remain unchanged.) #Closed

@wschinwschinApr 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thank you for pointing this out. Another iteration is pushed. Hopefully, it can address this comment.


/// <summary>
/// Set to true so that LIBMF may produce less information to STDOUT.
/// </summary>
[FieldOffset(52)]
public int Quiet;
[FieldOffset(49)]
public byte Quiet;

/// <summary>
/// Set to false so that LIBMF may reuse and modifiy the data passed in.
/// </summary>
[FieldOffset(56)]
public int CopyData;
[FieldOffset(50)]
public byte CopyData;
}

[StructLayout(LayoutKind.Explicit)]
Expand DownExpand Up@@ -223,9 +223,9 @@ public SafeTrainingAndModelBuffer(IHostEnvironment env, int fun, int k, int nrTh
_mfParam.Eta = (float)eta;
_mfParam.Alpha = (float)alpha;
_mfParam.C = (float)c;
_mfParam.DoNmf = doNmf ? 1 : 0;
_mfParam.Quiet = quiet ? 1 : 0;
_mfParam.CopyData = copyData ? 1 : 0;
_mfParam.DoNmf = doNmf ? (byte)1 : (byte)0;
_mfParam.Quiet = quiet ? (byte)1 : (byte)0;
_mfParam.CopyData = copyData ? (byte)1 : (byte)0;
}

~SafeTrainingAndModelBuffer()
Expand Down
37 changes: 30 additions & 7 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,25 +9,48 @@

using namespace mf;

mf_parameter make_param(const mf_parameter_bridge *param_bridge)
{
mf_parameter param;
param.fun = param_bridge->fun;
param.k = param_bridge->k;
param.nr_threads = param_bridge->nr_threads;
param.nr_bins = param_bridge->nr_bins;
param.nr_iters = param_bridge->nr_iters;
param.lambda_p1 = param_bridge->lambda_p1;
param.lambda_p2 = param_bridge->lambda_p2;
param.lambda_q1 = param_bridge->lambda_q1;
param.lambda_q2 = param_bridge->lambda_q2;
param.eta = param_bridge->eta;
param.alpha = param_bridge->alpha;
param.c = param_bridge->c;
param.do_nmf = param_bridge->do_nmf != 0 ? true : false;
param.quiet = param_bridge->quiet != 0 ? true : false;
param.copy_data = param_bridge->copy_data != 0 ? true : false;
return param;
}

EXPORT_API(void) MFDestroyModel(mf_model *&model)
{
return mf_destroy_model(&model);
}

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *param_bridge)
{
return mf_train(prob, *param);
auto param = make_param(param_bridge);
return mf_train(prob, param);
}

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *param_bridge)
{
return mf_train_with_validation(tr, va, *param);
auto param = make_param(param_bridge);
return mf_train_with_validation(tr, va, param);
}


EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter *param)
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge *param_bridge)
{
return mf_cross_validation(prob, nr_folds, *param);
auto param = make_param(param_bridge);
return mf_cross_validation(prob, nr_folds, param);
}

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx)
Expand Down
25 changes: 22 additions & 3 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,31 @@

using namespace mf;

struct mf_parameter_bridge
{
int32_t fun;
int32_t k;
int32_t nr_threads;
int32_t nr_bins;
int32_t nr_iters;
float lambda_p1;
float lambda_p2;
float lambda_q1;
float lambda_q2;
float eta;
float alpha;
float c;
uint8_t do_nmf;
uint8_t quiet;
uint8_t copy_data;
};

EXPORT_API(void) MFDestroyModel(mf_model *&model);

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter* param);
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge* parameter_bridge);

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx);
2 changes: 1 addition & 1 deletion src/Native/MatrixFactorizationNative/libmf
Open in desktop
Submodule libmf updated 1 files
+5 −0 mf.cpp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Fix marshalling of bool flags in MF#3210

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

Merged
wschin merged 3 commits into from
Apr 5, 2019
Merged

Fix marshalling of bool flags in MF #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c8090c
Fix marshalling of bool flags in MF
wschin Apr 5, 2019
fbbc121
Address comment
wschin Apr 5, 2019
1bcdc54
Better type of C# and C bool bridge
wschin Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Microsoft.ML.Recommender/SafeTrainingAndModelBuffer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,19 +133,19 @@ private struct MFParameter
/// Specify if the factor matrices should be non-negative.
/// </summary>
[FieldOffset(48)]
public int DoNmf;
public byte DoNmf;

@eerhardteerhardtApr 5, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

While this is better than what we had before, this is still not correct.

https://docs.microsoft.com/en-us/cpp/cpp/fundamental-types-cpp?view=vs-2019

bool Type bool is an integral type that can have one of the two values true or false. Its size is unspecified.

https://en.cppreference.com/w/cpp/language/types

bool - type, capable of holding one of the two values: true or false. The value of sizeof(bool) is implementation defined and might differ from 1.

Instead, to make interop/marshalling work correctly on all computers - the technique we use in .NET is to ensure the ABI (application binary interface) is stable no matter the compiler/processor/etc. This means only stable-sized types can be used in the ABI that C# code P/Invokes into.

So to fix this, the libmf C code should change to have a stable ABI. I see it uses float, int, and bool. For sure int and bool can change sizes depending on the compiler/processor. Instead, we should be using int32_t and int8_t on the C side. (Note: you can just have a wrapper export function in the C library that exposes the stable ABI and calls into your current code. So the main C/C++ code can remain unchanged.) #Closed

@wschinwschinApr 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thank you for pointing this out. Another iteration is pushed. Hopefully, it can address this comment.


/// <summary>
/// Set to true so that LIBMF may produce less information to STDOUT.
/// </summary>
[FieldOffset(52)]
public int Quiet;
[FieldOffset(49)]
public byte Quiet;

/// <summary>
/// Set to false so that LIBMF may reuse and modifiy the data passed in.
/// </summary>
[FieldOffset(56)]
public int CopyData;
[FieldOffset(50)]
public byte CopyData;
}

[StructLayout(LayoutKind.Explicit)]
Expand DownExpand Up@@ -223,9 +223,9 @@ public SafeTrainingAndModelBuffer(IHostEnvironment env, int fun, int k, int nrTh
_mfParam.Eta = (float)eta;
_mfParam.Alpha = (float)alpha;
_mfParam.C = (float)c;
_mfParam.DoNmf = doNmf ? 1 : 0;
_mfParam.Quiet = quiet ? 1 : 0;
_mfParam.CopyData = copyData ? 1 : 0;
_mfParam.DoNmf = doNmf ? (byte)1 : (byte)0;
_mfParam.Quiet = quiet ? (byte)1 : (byte)0;
_mfParam.CopyData = copyData ? (byte)1 : (byte)0;
}

~SafeTrainingAndModelBuffer()
Expand Down
37 changes: 30 additions & 7 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,25 +9,48 @@

using namespace mf;

mf_parameter make_param(const mf_parameter_bridge *param_bridge)
{
mf_parameter param;
param.fun = param_bridge->fun;
param.k = param_bridge->k;
param.nr_threads = param_bridge->nr_threads;
param.nr_bins = param_bridge->nr_bins;
param.nr_iters = param_bridge->nr_iters;
param.lambda_p1 = param_bridge->lambda_p1;
param.lambda_p2 = param_bridge->lambda_p2;
param.lambda_q1 = param_bridge->lambda_q1;
param.lambda_q2 = param_bridge->lambda_q2;
param.eta = param_bridge->eta;
param.alpha = param_bridge->alpha;
param.c = param_bridge->c;
param.do_nmf = param_bridge->do_nmf != 0 ? true : false;
param.quiet = param_bridge->quiet != 0 ? true : false;
param.copy_data = param_bridge->copy_data != 0 ? true : false;
return param;
}

EXPORT_API(void) MFDestroyModel(mf_model *&model)
{
return mf_destroy_model(&model);
}

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *param_bridge)
{
return mf_train(prob, *param);
auto param = make_param(param_bridge);
return mf_train(prob, param);
}

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *param_bridge)
{
return mf_train_with_validation(tr, va, *param);
auto param = make_param(param_bridge);
return mf_train_with_validation(tr, va, param);
}


EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter *param)
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge *param_bridge)
{
return mf_cross_validation(prob, nr_folds, *param);
auto param = make_param(param_bridge);
return mf_cross_validation(prob, nr_folds, param);
}

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx)
Expand Down
25 changes: 22 additions & 3 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,31 @@

using namespace mf;

struct mf_parameter_bridge
{
int32_t fun;
int32_t k;
int32_t nr_threads;
int32_t nr_bins;
int32_t nr_iters;
float lambda_p1;
float lambda_p2;
float lambda_q1;
float lambda_q2;
float eta;
float alpha;
float c;
uint8_t do_nmf;
uint8_t quiet;
uint8_t copy_data;
};

EXPORT_API(void) MFDestroyModel(mf_model *&model);

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter* param);
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge* parameter_bridge);

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx);
2 changes: 1 addition & 1 deletion src/Native/MatrixFactorizationNative/libmf
Open in desktop
Submodule libmf updated 1 files
+5 −0 mf.cpp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix marshalling of bool flags in MF#3210

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

Merged
wschin merged 3 commits into from
Apr 5, 2019
Merged

Fix marshalling of bool flags in MF #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c8090c
Fix marshalling of bool flags in MF
wschin Apr 5, 2019
fbbc121
Address comment
wschin Apr 5, 2019
1bcdc54
Better type of C# and C bool bridge
wschin Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Microsoft.ML.Recommender/SafeTrainingAndModelBuffer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,19 +133,19 @@ private struct MFParameter
/// Specify if the factor matrices should be non-negative.
/// </summary>
[FieldOffset(48)]
public int DoNmf;
public byte DoNmf;

@eerhardteerhardtApr 5, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

While this is better than what we had before, this is still not correct.

https://docs.microsoft.com/en-us/cpp/cpp/fundamental-types-cpp?view=vs-2019

bool Type bool is an integral type that can have one of the two values true or false. Its size is unspecified.

https://en.cppreference.com/w/cpp/language/types

bool - type, capable of holding one of the two values: true or false. The value of sizeof(bool) is implementation defined and might differ from 1.

Instead, to make interop/marshalling work correctly on all computers - the technique we use in .NET is to ensure the ABI (application binary interface) is stable no matter the compiler/processor/etc. This means only stable-sized types can be used in the ABI that C# code P/Invokes into.

So to fix this, the libmf C code should change to have a stable ABI. I see it uses float, int, and bool. For sure int and bool can change sizes depending on the compiler/processor. Instead, we should be using int32_t and int8_t on the C side. (Note: you can just have a wrapper export function in the C library that exposes the stable ABI and calls into your current code. So the main C/C++ code can remain unchanged.) #Closed

@wschinwschinApr 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thank you for pointing this out. Another iteration is pushed. Hopefully, it can address this comment.


/// <summary>
/// Set to true so that LIBMF may produce less information to STDOUT.
/// </summary>
[FieldOffset(52)]
public int Quiet;
[FieldOffset(49)]
public byte Quiet;

/// <summary>
/// Set to false so that LIBMF may reuse and modifiy the data passed in.
/// </summary>
[FieldOffset(56)]
public int CopyData;
[FieldOffset(50)]
public byte CopyData;
}

[StructLayout(LayoutKind.Explicit)]
Expand DownExpand Up@@ -223,9 +223,9 @@ public SafeTrainingAndModelBuffer(IHostEnvironment env, int fun, int k, int nrTh
_mfParam.Eta = (float)eta;
_mfParam.Alpha = (float)alpha;
_mfParam.C = (float)c;
_mfParam.DoNmf = doNmf ? 1 : 0;
_mfParam.Quiet = quiet ? 1 : 0;
_mfParam.CopyData = copyData ? 1 : 0;
_mfParam.DoNmf = doNmf ? (byte)1 : (byte)0;
_mfParam.Quiet = quiet ? (byte)1 : (byte)0;
_mfParam.CopyData = copyData ? (byte)1 : (byte)0;
}

~SafeTrainingAndModelBuffer()
Expand Down
37 changes: 30 additions & 7 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,25 +9,48 @@

using namespace mf;

mf_parameter make_param(const mf_parameter_bridge *param_bridge)
{
mf_parameter param;
param.fun = param_bridge->fun;
param.k = param_bridge->k;
param.nr_threads = param_bridge->nr_threads;
param.nr_bins = param_bridge->nr_bins;
param.nr_iters = param_bridge->nr_iters;
param.lambda_p1 = param_bridge->lambda_p1;
param.lambda_p2 = param_bridge->lambda_p2;
param.lambda_q1 = param_bridge->lambda_q1;
param.lambda_q2 = param_bridge->lambda_q2;
param.eta = param_bridge->eta;
param.alpha = param_bridge->alpha;
param.c = param_bridge->c;
param.do_nmf = param_bridge->do_nmf != 0 ? true : false;
param.quiet = param_bridge->quiet != 0 ? true : false;
param.copy_data = param_bridge->copy_data != 0 ? true : false;
return param;
}

EXPORT_API(void) MFDestroyModel(mf_model *&model)
{
return mf_destroy_model(&model);
}

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *param_bridge)
{
return mf_train(prob, *param);
auto param = make_param(param_bridge);
return mf_train(prob, param);
}

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *param_bridge)
{
return mf_train_with_validation(tr, va, *param);
auto param = make_param(param_bridge);
return mf_train_with_validation(tr, va, param);
}


EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter *param)
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge *param_bridge)
{
return mf_cross_validation(prob, nr_folds, *param);
auto param = make_param(param_bridge);
return mf_cross_validation(prob, nr_folds, param);
}

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx)
Expand Down
25 changes: 22 additions & 3 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,31 @@

using namespace mf;

struct mf_parameter_bridge
{
int32_t fun;
int32_t k;
int32_t nr_threads;
int32_t nr_bins;
int32_t nr_iters;
float lambda_p1;
float lambda_p2;
float lambda_q1;
float lambda_q2;
float eta;
float alpha;
float c;
uint8_t do_nmf;
uint8_t quiet;
uint8_t copy_data;
};

EXPORT_API(void) MFDestroyModel(mf_model *&model);

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter* param);
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge* parameter_bridge);

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx);
2 changes: 1 addition & 1 deletion src/Native/MatrixFactorizationNative/libmf
Open in desktop
Submodule libmf updated 1 files
+5 −0 mf.cpp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix marshalling of bool flags in MF#3210

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

Merged
wschin merged 3 commits into from
Apr 5, 2019
Merged

Fix marshalling of bool flags in MF #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c8090c
Fix marshalling of bool flags in MF
wschin Apr 5, 2019
fbbc121
Address comment
wschin Apr 5, 2019
1bcdc54
Better type of C# and C bool bridge
wschin Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Microsoft.ML.Recommender/SafeTrainingAndModelBuffer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,19 +133,19 @@ private struct MFParameter
/// Specify if the factor matrices should be non-negative.
/// </summary>
[FieldOffset(48)]
public int DoNmf;
public byte DoNmf;

@eerhardteerhardtApr 5, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

While this is better than what we had before, this is still not correct.

https://docs.microsoft.com/en-us/cpp/cpp/fundamental-types-cpp?view=vs-2019

bool Type bool is an integral type that can have one of the two values true or false. Its size is unspecified.

https://en.cppreference.com/w/cpp/language/types

bool - type, capable of holding one of the two values: true or false. The value of sizeof(bool) is implementation defined and might differ from 1.

Instead, to make interop/marshalling work correctly on all computers - the technique we use in .NET is to ensure the ABI (application binary interface) is stable no matter the compiler/processor/etc. This means only stable-sized types can be used in the ABI that C# code P/Invokes into.

So to fix this, the libmf C code should change to have a stable ABI. I see it uses float, int, and bool. For sure int and bool can change sizes depending on the compiler/processor. Instead, we should be using int32_t and int8_t on the C side. (Note: you can just have a wrapper export function in the C library that exposes the stable ABI and calls into your current code. So the main C/C++ code can remain unchanged.) #Closed

@wschinwschinApr 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thank you for pointing this out. Another iteration is pushed. Hopefully, it can address this comment.


/// <summary>
/// Set to true so that LIBMF may produce less information to STDOUT.
/// </summary>
[FieldOffset(52)]
public int Quiet;
[FieldOffset(49)]
public byte Quiet;

/// <summary>
/// Set to false so that LIBMF may reuse and modifiy the data passed in.
/// </summary>
[FieldOffset(56)]
public int CopyData;
[FieldOffset(50)]
public byte CopyData;
}

[StructLayout(LayoutKind.Explicit)]
Expand DownExpand Up@@ -223,9 +223,9 @@ public SafeTrainingAndModelBuffer(IHostEnvironment env, int fun, int k, int nrTh
_mfParam.Eta = (float)eta;
_mfParam.Alpha = (float)alpha;
_mfParam.C = (float)c;
_mfParam.DoNmf = doNmf ? 1 : 0;
_mfParam.Quiet = quiet ? 1 : 0;
_mfParam.CopyData = copyData ? 1 : 0;
_mfParam.DoNmf = doNmf ? (byte)1 : (byte)0;
_mfParam.Quiet = quiet ? (byte)1 : (byte)0;
_mfParam.CopyData = copyData ? (byte)1 : (byte)0;
}

~SafeTrainingAndModelBuffer()
Expand Down
37 changes: 30 additions & 7 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,25 +9,48 @@

using namespace mf;

mf_parameter make_param(const mf_parameter_bridge *param_bridge)
{
mf_parameter param;
param.fun = param_bridge->fun;
param.k = param_bridge->k;
param.nr_threads = param_bridge->nr_threads;
param.nr_bins = param_bridge->nr_bins;
param.nr_iters = param_bridge->nr_iters;
param.lambda_p1 = param_bridge->lambda_p1;
param.lambda_p2 = param_bridge->lambda_p2;
param.lambda_q1 = param_bridge->lambda_q1;
param.lambda_q2 = param_bridge->lambda_q2;
param.eta = param_bridge->eta;
param.alpha = param_bridge->alpha;
param.c = param_bridge->c;
param.do_nmf = param_bridge->do_nmf != 0 ? true : false;
param.quiet = param_bridge->quiet != 0 ? true : false;
param.copy_data = param_bridge->copy_data != 0 ? true : false;
return param;
}

EXPORT_API(void) MFDestroyModel(mf_model *&model)
{
return mf_destroy_model(&model);
}

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *param_bridge)
{
return mf_train(prob, *param);
auto param = make_param(param_bridge);
return mf_train(prob, param);
}

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *param_bridge)
{
return mf_train_with_validation(tr, va, *param);
auto param = make_param(param_bridge);
return mf_train_with_validation(tr, va, param);
}


EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter *param)
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge *param_bridge)
{
return mf_cross_validation(prob, nr_folds, *param);
auto param = make_param(param_bridge);
return mf_cross_validation(prob, nr_folds, param);
}

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx)
Expand Down
25 changes: 22 additions & 3 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,31 @@

using namespace mf;

struct mf_parameter_bridge
{
int32_t fun;
int32_t k;
int32_t nr_threads;
int32_t nr_bins;
int32_t nr_iters;
float lambda_p1;
float lambda_p2;
float lambda_q1;
float lambda_q2;
float eta;
float alpha;
float c;
uint8_t do_nmf;
uint8_t quiet;
uint8_t copy_data;
};

EXPORT_API(void) MFDestroyModel(mf_model *&model);

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter* param);
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge* parameter_bridge);

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx);
2 changes: 1 addition & 1 deletion src/Native/MatrixFactorizationNative/libmf
Open in desktop
Submodule libmf updated 1 files
+5 −0 mf.cpp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Fix marshalling of bool flags in MF#3210

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

Merged
wschin merged 3 commits into from
Apr 5, 2019
Merged

Fix marshalling of bool flags in MF #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c8090c
Fix marshalling of bool flags in MF
wschin Apr 5, 2019
fbbc121
Address comment
wschin Apr 5, 2019
1bcdc54
Better type of C# and C bool bridge
wschin Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Microsoft.ML.Recommender/SafeTrainingAndModelBuffer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,19 +133,19 @@ private struct MFParameter
/// Specify if the factor matrices should be non-negative.
/// </summary>
[FieldOffset(48)]
public int DoNmf;
public byte DoNmf;

@eerhardteerhardtApr 5, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

While this is better than what we had before, this is still not correct.

https://docs.microsoft.com/en-us/cpp/cpp/fundamental-types-cpp?view=vs-2019

bool Type bool is an integral type that can have one of the two values true or false. Its size is unspecified.

https://en.cppreference.com/w/cpp/language/types

bool - type, capable of holding one of the two values: true or false. The value of sizeof(bool) is implementation defined and might differ from 1.

Instead, to make interop/marshalling work correctly on all computers - the technique we use in .NET is to ensure the ABI (application binary interface) is stable no matter the compiler/processor/etc. This means only stable-sized types can be used in the ABI that C# code P/Invokes into.

So to fix this, the libmf C code should change to have a stable ABI. I see it uses float, int, and bool. For sure int and bool can change sizes depending on the compiler/processor. Instead, we should be using int32_t and int8_t on the C side. (Note: you can just have a wrapper export function in the C library that exposes the stable ABI and calls into your current code. So the main C/C++ code can remain unchanged.) #Closed

@wschinwschinApr 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thank you for pointing this out. Another iteration is pushed. Hopefully, it can address this comment.


/// <summary>
/// Set to true so that LIBMF may produce less information to STDOUT.
/// </summary>
[FieldOffset(52)]
public int Quiet;
[FieldOffset(49)]
public byte Quiet;

/// <summary>
/// Set to false so that LIBMF may reuse and modifiy the data passed in.
/// </summary>
[FieldOffset(56)]
public int CopyData;
[FieldOffset(50)]
public byte CopyData;
}

[StructLayout(LayoutKind.Explicit)]
Expand DownExpand Up@@ -223,9 +223,9 @@ public SafeTrainingAndModelBuffer(IHostEnvironment env, int fun, int k, int nrTh
_mfParam.Eta = (float)eta;
_mfParam.Alpha = (float)alpha;
_mfParam.C = (float)c;
_mfParam.DoNmf = doNmf ? 1 : 0;
_mfParam.Quiet = quiet ? 1 : 0;
_mfParam.CopyData = copyData ? 1 : 0;
_mfParam.DoNmf = doNmf ? (byte)1 : (byte)0;
_mfParam.Quiet = quiet ? (byte)1 : (byte)0;
_mfParam.CopyData = copyData ? (byte)1 : (byte)0;
}

~SafeTrainingAndModelBuffer()
Expand Down
37 changes: 30 additions & 7 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,25 +9,48 @@

using namespace mf;

mf_parameter make_param(const mf_parameter_bridge *param_bridge)
{
mf_parameter param;
param.fun = param_bridge->fun;
param.k = param_bridge->k;
param.nr_threads = param_bridge->nr_threads;
param.nr_bins = param_bridge->nr_bins;
param.nr_iters = param_bridge->nr_iters;
param.lambda_p1 = param_bridge->lambda_p1;
param.lambda_p2 = param_bridge->lambda_p2;
param.lambda_q1 = param_bridge->lambda_q1;
param.lambda_q2 = param_bridge->lambda_q2;
param.eta = param_bridge->eta;
param.alpha = param_bridge->alpha;
param.c = param_bridge->c;
param.do_nmf = param_bridge->do_nmf != 0 ? true : false;
param.quiet = param_bridge->quiet != 0 ? true : false;
param.copy_data = param_bridge->copy_data != 0 ? true : false;
return param;
}

EXPORT_API(void) MFDestroyModel(mf_model *&model)
{
return mf_destroy_model(&model);
}

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *param_bridge)
{
return mf_train(prob, *param);
auto param = make_param(param_bridge);
return mf_train(prob, param);
}

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *param_bridge)
{
return mf_train_with_validation(tr, va, *param);
auto param = make_param(param_bridge);
return mf_train_with_validation(tr, va, param);
}


EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter *param)
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge *param_bridge)
{
return mf_cross_validation(prob, nr_folds, *param);
auto param = make_param(param_bridge);
return mf_cross_validation(prob, nr_folds, param);
}

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx)
Expand Down
25 changes: 22 additions & 3 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,31 @@

using namespace mf;

struct mf_parameter_bridge
{
int32_t fun;
int32_t k;
int32_t nr_threads;
int32_t nr_bins;
int32_t nr_iters;
float lambda_p1;
float lambda_p2;
float lambda_q1;
float lambda_q2;
float eta;
float alpha;
float c;
uint8_t do_nmf;
uint8_t quiet;
uint8_t copy_data;
};

EXPORT_API(void) MFDestroyModel(mf_model *&model);

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter* param);
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge* parameter_bridge);

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx);
2 changes: 1 addition & 1 deletion src/Native/MatrixFactorizationNative/libmf
Open in desktop
Submodule libmf updated 1 files
+5 −0 mf.cpp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix marshalling of bool flags in MF#3210

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

Merged
wschin merged 3 commits into from
Apr 5, 2019
Merged

Fix marshalling of bool flags in MF #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c8090c
Fix marshalling of bool flags in MF
wschin Apr 5, 2019
fbbc121
Address comment
wschin Apr 5, 2019
1bcdc54
Better type of C# and C bool bridge
wschin Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Microsoft.ML.Recommender/SafeTrainingAndModelBuffer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,19 +133,19 @@ private struct MFParameter
/// Specify if the factor matrices should be non-negative.
/// </summary>
[FieldOffset(48)]
public int DoNmf;
public byte DoNmf;

@eerhardteerhardtApr 5, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

While this is better than what we had before, this is still not correct.

https://docs.microsoft.com/en-us/cpp/cpp/fundamental-types-cpp?view=vs-2019

bool Type bool is an integral type that can have one of the two values true or false. Its size is unspecified.

https://en.cppreference.com/w/cpp/language/types

bool - type, capable of holding one of the two values: true or false. The value of sizeof(bool) is implementation defined and might differ from 1.

Instead, to make interop/marshalling work correctly on all computers - the technique we use in .NET is to ensure the ABI (application binary interface) is stable no matter the compiler/processor/etc. This means only stable-sized types can be used in the ABI that C# code P/Invokes into.

So to fix this, the libmf C code should change to have a stable ABI. I see it uses float, int, and bool. For sure int and bool can change sizes depending on the compiler/processor. Instead, we should be using int32_t and int8_t on the C side. (Note: you can just have a wrapper export function in the C library that exposes the stable ABI and calls into your current code. So the main C/C++ code can remain unchanged.) #Closed

@wschinwschinApr 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thank you for pointing this out. Another iteration is pushed. Hopefully, it can address this comment.


/// <summary>
/// Set to true so that LIBMF may produce less information to STDOUT.
/// </summary>
[FieldOffset(52)]
public int Quiet;
[FieldOffset(49)]
public byte Quiet;

/// <summary>
/// Set to false so that LIBMF may reuse and modifiy the data passed in.
/// </summary>
[FieldOffset(56)]
public int CopyData;
[FieldOffset(50)]
public byte CopyData;
}

[StructLayout(LayoutKind.Explicit)]
Expand DownExpand Up@@ -223,9 +223,9 @@ public SafeTrainingAndModelBuffer(IHostEnvironment env, int fun, int k, int nrTh
_mfParam.Eta = (float)eta;
_mfParam.Alpha = (float)alpha;
_mfParam.C = (float)c;
_mfParam.DoNmf = doNmf ? 1 : 0;
_mfParam.Quiet = quiet ? 1 : 0;
_mfParam.CopyData = copyData ? 1 : 0;
_mfParam.DoNmf = doNmf ? (byte)1 : (byte)0;
_mfParam.Quiet = quiet ? (byte)1 : (byte)0;
_mfParam.CopyData = copyData ? (byte)1 : (byte)0;
}

~SafeTrainingAndModelBuffer()
Expand Down
37 changes: 30 additions & 7 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,25 +9,48 @@

using namespace mf;

mf_parameter make_param(const mf_parameter_bridge *param_bridge)
{
mf_parameter param;
param.fun = param_bridge->fun;
param.k = param_bridge->k;
param.nr_threads = param_bridge->nr_threads;
param.nr_bins = param_bridge->nr_bins;
param.nr_iters = param_bridge->nr_iters;
param.lambda_p1 = param_bridge->lambda_p1;
param.lambda_p2 = param_bridge->lambda_p2;
param.lambda_q1 = param_bridge->lambda_q1;
param.lambda_q2 = param_bridge->lambda_q2;
param.eta = param_bridge->eta;
param.alpha = param_bridge->alpha;
param.c = param_bridge->c;
param.do_nmf = param_bridge->do_nmf != 0 ? true : false;
param.quiet = param_bridge->quiet != 0 ? true : false;
param.copy_data = param_bridge->copy_data != 0 ? true : false;
return param;
}

EXPORT_API(void) MFDestroyModel(mf_model *&model)
{
return mf_destroy_model(&model);
}

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *param_bridge)
{
return mf_train(prob, *param);
auto param = make_param(param_bridge);
return mf_train(prob, param);
}

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *param_bridge)
{
return mf_train_with_validation(tr, va, *param);
auto param = make_param(param_bridge);
return mf_train_with_validation(tr, va, param);
}


EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter *param)
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge *param_bridge)
{
return mf_cross_validation(prob, nr_folds, *param);
auto param = make_param(param_bridge);
return mf_cross_validation(prob, nr_folds, param);
}

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx)
Expand Down
25 changes: 22 additions & 3 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,31 @@

using namespace mf;

struct mf_parameter_bridge
{
int32_t fun;
int32_t k;
int32_t nr_threads;
int32_t nr_bins;
int32_t nr_iters;
float lambda_p1;
float lambda_p2;
float lambda_q1;
float lambda_q2;
float eta;
float alpha;
float c;
uint8_t do_nmf;
uint8_t quiet;
uint8_t copy_data;
};

EXPORT_API(void) MFDestroyModel(mf_model *&model);

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter* param);
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge* parameter_bridge);

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx);
2 changes: 1 addition & 1 deletion src/Native/MatrixFactorizationNative/libmf
Open in desktop
Submodule libmf updated 1 files
+5 −0 mf.cpp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix marshalling of bool flags in MF#3210

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

Merged
wschin merged 3 commits into from
Apr 5, 2019
Merged

Fix marshalling of bool flags in MF #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c8090c
Fix marshalling of bool flags in MF
wschin Apr 5, 2019
fbbc121
Address comment
wschin Apr 5, 2019
1bcdc54
Better type of C# and C bool bridge
wschin Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Microsoft.ML.Recommender/SafeTrainingAndModelBuffer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,19 +133,19 @@ private struct MFParameter
/// Specify if the factor matrices should be non-negative.
/// </summary>
[FieldOffset(48)]
public int DoNmf;
public byte DoNmf;

@eerhardteerhardtApr 5, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

While this is better than what we had before, this is still not correct.

https://docs.microsoft.com/en-us/cpp/cpp/fundamental-types-cpp?view=vs-2019

bool Type bool is an integral type that can have one of the two values true or false. Its size is unspecified.

https://en.cppreference.com/w/cpp/language/types

bool - type, capable of holding one of the two values: true or false. The value of sizeof(bool) is implementation defined and might differ from 1.

Instead, to make interop/marshalling work correctly on all computers - the technique we use in .NET is to ensure the ABI (application binary interface) is stable no matter the compiler/processor/etc. This means only stable-sized types can be used in the ABI that C# code P/Invokes into.

So to fix this, the libmf C code should change to have a stable ABI. I see it uses float, int, and bool. For sure int and bool can change sizes depending on the compiler/processor. Instead, we should be using int32_t and int8_t on the C side. (Note: you can just have a wrapper export function in the C library that exposes the stable ABI and calls into your current code. So the main C/C++ code can remain unchanged.) #Closed

@wschinwschinApr 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thank you for pointing this out. Another iteration is pushed. Hopefully, it can address this comment.


/// <summary>
/// Set to true so that LIBMF may produce less information to STDOUT.
/// </summary>
[FieldOffset(52)]
public int Quiet;
[FieldOffset(49)]
public byte Quiet;

/// <summary>
/// Set to false so that LIBMF may reuse and modifiy the data passed in.
/// </summary>
[FieldOffset(56)]
public int CopyData;
[FieldOffset(50)]
public byte CopyData;
}

[StructLayout(LayoutKind.Explicit)]
Expand DownExpand Up@@ -223,9 +223,9 @@ public SafeTrainingAndModelBuffer(IHostEnvironment env, int fun, int k, int nrTh
_mfParam.Eta = (float)eta;
_mfParam.Alpha = (float)alpha;
_mfParam.C = (float)c;
_mfParam.DoNmf = doNmf ? 1 : 0;
_mfParam.Quiet = quiet ? 1 : 0;
_mfParam.CopyData = copyData ? 1 : 0;
_mfParam.DoNmf = doNmf ? (byte)1 : (byte)0;
_mfParam.Quiet = quiet ? (byte)1 : (byte)0;
_mfParam.CopyData = copyData ? (byte)1 : (byte)0;
}

~SafeTrainingAndModelBuffer()
Expand Down
37 changes: 30 additions & 7 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,25 +9,48 @@

using namespace mf;

mf_parameter make_param(const mf_parameter_bridge *param_bridge)
{
mf_parameter param;
param.fun = param_bridge->fun;
param.k = param_bridge->k;
param.nr_threads = param_bridge->nr_threads;
param.nr_bins = param_bridge->nr_bins;
param.nr_iters = param_bridge->nr_iters;
param.lambda_p1 = param_bridge->lambda_p1;
param.lambda_p2 = param_bridge->lambda_p2;
param.lambda_q1 = param_bridge->lambda_q1;
param.lambda_q2 = param_bridge->lambda_q2;
param.eta = param_bridge->eta;
param.alpha = param_bridge->alpha;
param.c = param_bridge->c;
param.do_nmf = param_bridge->do_nmf != 0 ? true : false;
param.quiet = param_bridge->quiet != 0 ? true : false;
param.copy_data = param_bridge->copy_data != 0 ? true : false;
return param;
}

EXPORT_API(void) MFDestroyModel(mf_model *&model)
{
return mf_destroy_model(&model);
}

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *param_bridge)
{
return mf_train(prob, *param);
auto param = make_param(param_bridge);
return mf_train(prob, param);
}

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *param_bridge)
{
return mf_train_with_validation(tr, va, *param);
auto param = make_param(param_bridge);
return mf_train_with_validation(tr, va, param);
}


EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter *param)
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge *param_bridge)
{
return mf_cross_validation(prob, nr_folds, *param);
auto param = make_param(param_bridge);
return mf_cross_validation(prob, nr_folds, param);
}

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx)
Expand Down
25 changes: 22 additions & 3 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,31 @@

using namespace mf;

struct mf_parameter_bridge
{
int32_t fun;
int32_t k;
int32_t nr_threads;
int32_t nr_bins;
int32_t nr_iters;
float lambda_p1;
float lambda_p2;
float lambda_q1;
float lambda_q2;
float eta;
float alpha;
float c;
uint8_t do_nmf;
uint8_t quiet;
uint8_t copy_data;
};

EXPORT_API(void) MFDestroyModel(mf_model *&model);

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter* param);
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge* parameter_bridge);

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx);
2 changes: 1 addition & 1 deletion src/Native/MatrixFactorizationNative/libmf
Open in desktop
Submodule libmf updated 1 files
+5 −0 mf.cpp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Fix marshalling of bool flags in MF#3210

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

Merged
wschin merged 3 commits into from
Apr 5, 2019
Merged

Fix marshalling of bool flags in MF #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c8090c
Fix marshalling of bool flags in MF
wschin Apr 5, 2019
fbbc121
Address comment
wschin Apr 5, 2019
1bcdc54
Better type of C# and C bool bridge
wschin Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Microsoft.ML.Recommender/SafeTrainingAndModelBuffer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,19 +133,19 @@ private struct MFParameter
/// Specify if the factor matrices should be non-negative.
/// </summary>
[FieldOffset(48)]
public int DoNmf;
public byte DoNmf;

@eerhardteerhardtApr 5, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

While this is better than what we had before, this is still not correct.

https://docs.microsoft.com/en-us/cpp/cpp/fundamental-types-cpp?view=vs-2019

bool Type bool is an integral type that can have one of the two values true or false. Its size is unspecified.

https://en.cppreference.com/w/cpp/language/types

bool - type, capable of holding one of the two values: true or false. The value of sizeof(bool) is implementation defined and might differ from 1.

Instead, to make interop/marshalling work correctly on all computers - the technique we use in .NET is to ensure the ABI (application binary interface) is stable no matter the compiler/processor/etc. This means only stable-sized types can be used in the ABI that C# code P/Invokes into.

So to fix this, the libmf C code should change to have a stable ABI. I see it uses float, int, and bool. For sure int and bool can change sizes depending on the compiler/processor. Instead, we should be using int32_t and int8_t on the C side. (Note: you can just have a wrapper export function in the C library that exposes the stable ABI and calls into your current code. So the main C/C++ code can remain unchanged.) #Closed

@wschinwschinApr 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Thank you for pointing this out. Another iteration is pushed. Hopefully, it can address this comment.


/// <summary>
/// Set to true so that LIBMF may produce less information to STDOUT.
/// </summary>
[FieldOffset(52)]
public int Quiet;
[FieldOffset(49)]
public byte Quiet;

/// <summary>
/// Set to false so that LIBMF may reuse and modifiy the data passed in.
/// </summary>
[FieldOffset(56)]
public int CopyData;
[FieldOffset(50)]
public byte CopyData;
}

[StructLayout(LayoutKind.Explicit)]
Expand DownExpand Up@@ -223,9 +223,9 @@ public SafeTrainingAndModelBuffer(IHostEnvironment env, int fun, int k, int nrTh
_mfParam.Eta = (float)eta;
_mfParam.Alpha = (float)alpha;
_mfParam.C = (float)c;
_mfParam.DoNmf = doNmf ? 1 : 0;
_mfParam.Quiet = quiet ? 1 : 0;
_mfParam.CopyData = copyData ? 1 : 0;
_mfParam.DoNmf = doNmf ? (byte)1 : (byte)0;
_mfParam.Quiet = quiet ? (byte)1 : (byte)0;
_mfParam.CopyData = copyData ? (byte)1 : (byte)0;
}

~SafeTrainingAndModelBuffer()
Expand Down
37 changes: 30 additions & 7 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,25 +9,48 @@

using namespace mf;

mf_parameter make_param(const mf_parameter_bridge *param_bridge)
{
mf_parameter param;
param.fun = param_bridge->fun;
param.k = param_bridge->k;
param.nr_threads = param_bridge->nr_threads;
param.nr_bins = param_bridge->nr_bins;
param.nr_iters = param_bridge->nr_iters;
param.lambda_p1 = param_bridge->lambda_p1;
param.lambda_p2 = param_bridge->lambda_p2;
param.lambda_q1 = param_bridge->lambda_q1;
param.lambda_q2 = param_bridge->lambda_q2;
param.eta = param_bridge->eta;
param.alpha = param_bridge->alpha;
param.c = param_bridge->c;
param.do_nmf = param_bridge->do_nmf != 0 ? true : false;
param.quiet = param_bridge->quiet != 0 ? true : false;
param.copy_data = param_bridge->copy_data != 0 ? true : false;
return param;
}

EXPORT_API(void) MFDestroyModel(mf_model *&model)
{
return mf_destroy_model(&model);
}

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *param_bridge)
{
return mf_train(prob, *param);
auto param = make_param(param_bridge);
return mf_train(prob, param);
}

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param)
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *param_bridge)
{
return mf_train_with_validation(tr, va, *param);
auto param = make_param(param_bridge);
return mf_train_with_validation(tr, va, param);
}


EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter *param)
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge *param_bridge)
{
return mf_cross_validation(prob, nr_folds, *param);
auto param = make_param(param_bridge);
return mf_cross_validation(prob, nr_folds, param);
}

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx)
Expand Down
25 changes: 22 additions & 3 deletions src/Native/MatrixFactorizationNative/UnmanagedMemory.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,12 +8,31 @@

using namespace mf;

struct mf_parameter_bridge
{
int32_t fun;
int32_t k;
int32_t nr_threads;
int32_t nr_bins;
int32_t nr_iters;
float lambda_p1;
float lambda_p2;
float lambda_q1;
float lambda_q2;
float eta;
float alpha;
float c;
uint8_t do_nmf;
uint8_t quiet;
uint8_t copy_data;
};

EXPORT_API(void) MFDestroyModel(mf_model *&model);

EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrain(const mf_problem *prob, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter *param);
EXPORT_API(mf_model*) MFTrainWithValidation(const mf_problem *tr, const mf_problem *va, const mf_parameter_bridge *parameter_bridge);

EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter* param);
EXPORT_API(float) MFCrossValidation(const mf_problem *prob, int nr_folds, const mf_parameter_bridge* parameter_bridge);

EXPORT_API(float) MFPredict(const mf_model *model, int p_idx, int q_idx);
2 changes: 1 addition & 1 deletion src/Native/MatrixFactorizationNative/libmf
Open in desktop
Submodule libmf updated 1 files
+5 −0 mf.cpp