Skip to content

Commit 4189a48

Browse files
committed
Try to fix compile/test issues.
1 parent 6cebc56 commit 4189a48

3 files changed

Lines changed: 28 additions & 26 deletions

File tree

src/ApproximationTables.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ struct Approximation {
3232
};
3333

3434
namespace ApproximationTables {
35-
extern const std::vector<Approximation> table_atan;
36-
extern const std::vector<Approximation> table_sin;
37-
extern const std::vector<Approximation> table_cos;
38-
extern const std::vector<Approximation> table_tan;
39-
extern const std::vector<Approximation> table_expm1;
40-
extern const std::vector<Approximation> table_exp;
41-
extern const std::vector<Approximation> table_log;
35+
extern HALIDE_EXPORT_SYMBOL const std::vector<Approximation> table_atan;
36+
extern HALIDE_EXPORT_SYMBOL const std::vector<Approximation> table_sin;
37+
extern HALIDE_EXPORT_SYMBOL const std::vector<Approximation> table_cos;
38+
extern HALIDE_EXPORT_SYMBOL const std::vector<Approximation> table_tan;
39+
extern HALIDE_EXPORT_SYMBOL const std::vector<Approximation> table_expm1;
40+
extern HALIDE_EXPORT_SYMBOL const std::vector<Approximation> table_exp;
41+
extern HALIDE_EXPORT_SYMBOL const std::vector<Approximation> table_log;
4242

4343
const Approximation *best_atan_approximation(Halide::ApproximationPrecision precision, Type type);
4444
const Approximation *best_sin_approximation(Halide::ApproximationPrecision precision, Type type);

src/CodeGen_Metal_Dev.cpp

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,33 +64,37 @@ class CodeGen_Metal_Dev : public CodeGen_GPU_Dev {
6464
extern_function_name_map[x "_f16"] = y; \
6565
extern_function_name_map[x "_f32"] = y
6666
alias("sqrt", "sqrt");
67-
alias("sin", "sin");
68-
alias("cos", "cos");
69-
alias("exp", "exp");
70-
alias("log", "log");
67+
alias("sin", "precise::sin");
68+
alias("cos", "precise::cos");
69+
alias("exp", "precise::exp");
70+
alias("log", "precise::log");
7171
alias("abs", "fabs"); // f-prefix!
7272
alias("floor", "floor");
7373
alias("ceil", "ceil");
7474
alias("trunc", "trunc");
75-
alias("pow", "pow");
76-
alias("asin", "asin");
77-
alias("acos", "acos");
78-
alias("tan", "tan");
79-
alias("atan", "atan");
80-
alias("atan2", "atan2");
81-
alias("sinh", "sinh");
82-
alias("asinh", "asinh");
83-
alias("cosh", "cosh");
84-
alias("acosh", "acosh");
85-
alias("tanh", "tanh");
86-
alias("atanh", "atanh");
75+
alias("pow", "precise::pow");
76+
alias("asin", "precise::asin");
77+
alias("acos", "precise::acos");
78+
alias("tan", "precise::tan");
79+
alias("atan", "precise::atan");
80+
alias("atan2", "precise::atan2");
81+
alias("sinh", "precise::sinh");
82+
alias("asinh", "precise::asinh");
83+
alias("cosh", "precise::cosh");
84+
alias("acosh", "precise::acosh");
85+
alias("tanh", "precise::tanh");
86+
alias("atanh", "precise::atanh");
8787

8888
alias("is_nan", "isnan");
8989
alias("is_inf", "isinf");
9090
alias("is_finite", "isfinite");
9191

92-
alias("fast_sin", "fast::sin");
92+
alias("fast_acos", "fast::asin");
93+
alias("fast_asin", "fast::asin");
94+
alias("fast_atan", "fast::atan");
95+
alias("fast_atan2", "fast::atan2");
9396
alias("fast_cos", "fast::cos");
97+
alias("fast_sin", "fast::sin");
9498
alias("fast_tan", "fast::tan");
9599
alias("fast_exp", "fast::exp");
96100
alias("fast_log", "fast::log");

test/correctness/determine_fast_function_approximation_metrics.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ using namespace Halide;
77
using namespace Halide::Internal;
88

99
constexpr double PI = 3.14159265358979323846;
10-
constexpr double ONE_OVER_PI = 1.0 / PI;
11-
constexpr double TWO_OVER_PI = 2.0 / PI;
1210
constexpr double PI_OVER_TWO = PI / 2;
1311
constexpr double PI_OVER_FOUR = PI / 4;
1412

0 commit comments

Comments
 (0)