diff --git a/compression/BUILD b/compression/BUILD index 8c090fb..be76028 100644 --- a/compression/BUILD +++ b/compression/BUILD @@ -10,6 +10,21 @@ package( ], ) +config_setting( + name = "android", + constraint_values = [ + "@platforms//os:android", + ], + visibility = [":__subpackages__"], +) + +FILE_DEPS = select({ + "//conditions:default": [ + # Placeholder for io deps, do not remove + ], + ":android": [], +}) + cc_library( name = "io", srcs = [ @@ -18,9 +33,8 @@ cc_library( ], hdrs = ["io.h"], deps = [ - # Placeholder for io deps, do not remove "@hwy//:hwy", - ], + ] + FILE_DEPS, ) cc_library( diff --git a/compression/compress-inl.h b/compression/compress-inl.h index 4bef8c7..a293681 100644 --- a/compression/compress-inl.h +++ b/compression/compress-inl.h @@ -264,10 +264,10 @@ struct CompressTraits { i += N; } - sum0 = Add(sum0, sum1); - sum2 = Add(sum2, sum3); - sum0 = Add(sum0, sum2); - return ReduceSum(df32, sum0); + sum0 = hn::Add(sum0, sum1); + sum2 = hn::Add(sum2, sum3); + sum0 = hn::Add(sum0, sum2); + return hn::ReduceSum(df32, sum0); } }; diff --git a/gemma/ops.h b/gemma/ops.h index 7a8f240..8cac3f9 100644 --- a/gemma/ops.h +++ b/gemma/ops.h @@ -423,7 +423,7 @@ static HWY_INLINE hn::Vec Sigmoid(D d, hn::Vec v) { VF b3 = hn::Sub(hn::MulAdd(f2, b2, d3), b1); VF f1 = hn::Sub(hn::MulAdd(f, b3, d4), b2); - return Div(f0, f1); + return hn::Div(f0, f1); } // Sigmoid using the logistic function 1 / (1 + exp(-x[i]))