Fix ceil, round, floor used by complex bug.
This commit is contained in:
@@ -200,64 +200,64 @@ Aurora::Matrix Aurora::imag(const Aurora::Matrix &matrix) {
|
||||
}
|
||||
|
||||
Aurora::Matrix Aurora::ceil(const Aurora::Matrix &matrix) {
|
||||
auto output = malloc(matrix.getDataSize());
|
||||
auto output = malloc(matrix.getDataSize()*matrix.getValueType());
|
||||
//for real part
|
||||
vsCeilI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE, output, SAME_STRIDE);
|
||||
vsCeilI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE*matrix.getValueType(), output, SAME_STRIDE*matrix.getValueType());
|
||||
if (matrix.getValueType() == Complex) {
|
||||
//for imag part
|
||||
vsCeilI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE, output + 1, SAME_STRIDE);
|
||||
vsCeilI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE*matrix.getValueType(), output + 1, SAME_STRIDE*matrix.getValueType());
|
||||
}
|
||||
return Aurora::Matrix::New(output, matrix);
|
||||
}
|
||||
|
||||
Aurora::Matrix Aurora::ceil(const Aurora::Matrix &&matrix) {
|
||||
//for real part
|
||||
vsCeilI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE, matrix.getData(), SAME_STRIDE);
|
||||
vsCeilI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE*matrix.getValueType(), matrix.getData(), SAME_STRIDE*matrix.getValueType());
|
||||
if (matrix.getValueType() == Complex) {
|
||||
//for imag part
|
||||
vsCeilI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE, matrix.getData() + 1, SAME_STRIDE);
|
||||
vsCeilI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE*matrix.getValueType(), matrix.getData() + 1, SAME_STRIDE*matrix.getValueType());
|
||||
}
|
||||
return matrix;
|
||||
}
|
||||
|
||||
Aurora::Matrix Aurora::round(const Aurora::Matrix &matrix) {
|
||||
auto output = malloc(matrix.getDataSize());
|
||||
auto output = malloc(matrix.getDataSize()*matrix.getValueType());
|
||||
//for real part
|
||||
vsRoundI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE, output, SAME_STRIDE);
|
||||
vsRoundI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE*matrix.getValueType(), output, SAME_STRIDE*matrix.getValueType());
|
||||
if (matrix.getValueType() == Complex) {
|
||||
//for imag part
|
||||
vsRoundI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE, output + 1, SAME_STRIDE);
|
||||
vsRoundI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE*matrix.getValueType(), output + 1, SAME_STRIDE*matrix.getValueType());
|
||||
}
|
||||
return Aurora::Matrix::New(output, matrix);
|
||||
}
|
||||
|
||||
Aurora::Matrix Aurora::round(const Aurora::Matrix &&matrix) {
|
||||
//for real part
|
||||
vsRoundI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE, matrix.getData(), SAME_STRIDE);
|
||||
vsRoundI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE*matrix.getValueType(), matrix.getData(), SAME_STRIDE*matrix.getValueType());
|
||||
if (matrix.getValueType() == Complex) {
|
||||
//for imag part
|
||||
vsRoundI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE, matrix.getData() + 1, SAME_STRIDE);
|
||||
vsRoundI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE*matrix.getValueType(), matrix.getData() + 1, SAME_STRIDE*matrix.getValueType());
|
||||
}
|
||||
return matrix;
|
||||
}
|
||||
|
||||
Aurora::Matrix Aurora::floor(const Aurora::Matrix &matrix) {
|
||||
auto output = malloc(matrix.getDataSize());
|
||||
auto output = malloc(matrix.getDataSize()*matrix.getValueType());
|
||||
//for real part
|
||||
vsFloorI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE, output, SAME_STRIDE);
|
||||
vsFloorI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE*matrix.getValueType(), output, SAME_STRIDE*matrix.getValueType());
|
||||
if (matrix.getValueType() == Complex) {
|
||||
//for imag part
|
||||
vsFloorI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE, output + 1, SAME_STRIDE);
|
||||
vsFloorI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE*matrix.getValueType(), output + 1, SAME_STRIDE*matrix.getValueType());
|
||||
}
|
||||
return Aurora::Matrix::New(output, matrix);
|
||||
}
|
||||
|
||||
Aurora::Matrix Aurora::floor(const Aurora::Matrix &&matrix) {
|
||||
//for real part
|
||||
vsFloorI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE, matrix.getData(), SAME_STRIDE);
|
||||
vsFloorI(matrix.getDataSize(), matrix.getData(), SAME_STRIDE*matrix.getValueType(), matrix.getData(), SAME_STRIDE*matrix.getValueType());
|
||||
if (matrix.getValueType() == Complex) {
|
||||
//for imag part
|
||||
vsFloorI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE, matrix.getData() + 1, SAME_STRIDE);
|
||||
vsFloorI(matrix.getDataSize(), matrix.getData() + 1, SAME_STRIDE*matrix.getValueType(), matrix.getData() + 1, SAME_STRIDE*matrix.getValueType());
|
||||
}
|
||||
return matrix;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user