Skip to content

remove the GPL code #40

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

Open
wants to merge 3 commits into
base: gh-pages
Choose a base branch
from
Open

remove the GPL code #40

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
4f42305
Delete math_neon.h
CFAndy Mar 16, 2015
5e1e0ad
Delete math_powf.cpp
CFAndy Mar 16, 2015
ad9ec06
Update matrix_local_response.cpp
CFAndy Mar 16, 2015
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
18 changes: 1 addition & 17 deletions source/src/lib/math/matrix_local_response.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
#include <mkl_vml_functions.h>
#endif // USE_MKL_GEMM

#ifdef USE_NEON
#include <math_neon.h>
#endif

#include "buffer.h"

Expand Down Expand Up @@ -112,19 +109,6 @@ Buffer* matrix_local_response(Buffer* input, int windowSize, jpfloat_t k, jpfloa
vsPow(elementCount, magnitudeData, repeatedBeta, outputData);
free(repeatedBeta);
vsMul(elementCount, inputData, outputData, outputData);
#elif defined(USE_NEON)
while (inputData < inputDataEnd) {

const jpfloat_t inputValue = *inputData;
const jpfloat_t magnitudeValue = *magnitudeData;

jpfloat_t outputValue = (powf_neon(magnitudeValue, -beta) * inputValue);
*outputData = outputValue;

inputData += 1;
magnitudeData += 1;
outputData += 1;
}
#else // USE_ACCELERATE_GEMM
while (inputData < inputDataEnd) {

Expand All @@ -148,4 +132,4 @@ Buffer* matrix_local_response(Buffer* input, int windowSize, jpfloat_t k, jpfloa
#endif // DO_LOG_OPERATIONS

return output;
}
}
75 changes: 0 additions & 75 deletions source/src/lib/third_party/math_neon.h
View file
Open in desktop

This file was deleted.

178 changes: 0 additions & 178 deletions source/src/lib/third_party/math_powf.cpp
View file
Open in desktop

This file was deleted.