-
Notifications
You must be signed in to change notification settings - Fork 267
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.
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
flex_cblas_sdot and flex_cblas_snrm2 #486
Open
FJafargholi
wants to merge
4
commits into
feature/openblas
Choose a base branch
from
users/fj/flex_cblas_XYZ
base: feature/openblas
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,13 +4,42 @@ | |
#include <limits> | ||
#include <malloc.h> | ||
#include <math_utils.h> | ||
#include <mkl.h> | ||
#include "logger.h" | ||
#include "utils.h" | ||
|
||
#ifdef USE_OPENBLAS | ||
#include <cblas.h> | ||
#else | ||
#include <mkl.h> | ||
#endif | ||
|
||
namespace math_utils | ||
{ | ||
|
||
#ifdef USE_OPENBLAS | ||
using Flex_INT = int; | ||
#else | ||
using Flex_INT = MKL_INT; | ||
#endif | ||
|
||
float flex_cblas_sdot(const int64_t N, const float *X, const int incX, const float *Y, const int incY) noexcept | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can add these to math.h |
||
{ | ||
#ifdef USE_OPENBLAS | ||
return sdot(N, X, incX, Y, incY); | ||
#else | ||
return cblas_sdot(N, X, incX, Y, incY); | ||
#endif | ||
} | ||
|
||
float flex_cblas_snrm2(const Flex_INT N, const float *X, const Flex_INT incX) noexcept | ||
{ | ||
#ifdef USE_OPENBLAS | ||
return snrm2(N, X, incX); | ||
#else | ||
return cblas_snrm2(N, X, incX); | ||
#endif | ||
} | ||
|
||
float calc_distance(float *vec_1, float *vec_2, size_t dim) | ||
{ | ||
float dist = 0; | ||
|
@@ -29,7 +58,7 @@ void compute_vecs_l2sq(float *vecs_l2sq, float *data, const size_t num_points, c | |
#pragma omp parallel for schedule(static, 8192) | ||
for (int64_t n_iter = 0; n_iter < (int64_t)num_points; n_iter++) | ||
{ | ||
vecs_l2sq[n_iter] = cblas_snrm2((MKL_INT)dim, (data + (n_iter * dim)), 1); | ||
vecs_l2sq[n_iter] = flex_cblas_snrm2((MKL_INT)dim, (data + (n_iter * dim)), 1); | ||
vecs_l2sq[n_iter] *= vecs_l2sq[n_iter]; | ||
} | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you include #include "math_utils.h"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, it doesn't know the path.