From e241ae53c5a2c986c6077fac054d74f648079ea6 Mon Sep 17 00:00:00 2001
From: Miao Wang <miaowang@google.com>
Date: Tue, 18 Jul 2017 16:57:47 -0700
Subject: Add sigmoid functors to Eigen/Core.

  - Workaround to resolve Android NN API dependency.

Test: mm
Test: nnapi_example tests all pass
Change-Id: I9818787c3c6b46bb0cf3b91b31be20e7fa8955e5
---
 Eigen/src/Core/functors/UnaryFunctors.h | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/Eigen/src/Core/functors/UnaryFunctors.h b/Eigen/src/Core/functors/UnaryFunctors.h
index 2e6a00ffd..581a3c93a 100644
--- a/Eigen/src/Core/functors/UnaryFunctors.h
+++ b/Eigen/src/Core/functors/UnaryFunctors.h
@@ -14,6 +14,37 @@ namespace Eigen {
 
 namespace internal {
 
+// Copied from unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
+// TODO: remove or update after upstream
+/** \internal
+  * \brief Template functor to compute the sigmoid of a scalar
+  * \sa class CwiseUnaryOp, ArrayBase::sigmoid()
+  */
+template <typename T>
+struct scalar_sigmoid_op {
+  EIGEN_EMPTY_STRUCT_CTOR(scalar_sigmoid_op)
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T operator()(const T& x) const {
+    const T one = T(1);
+    return one / (one + numext::exp(-x));
+  }
+
+  template <typename Packet> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
+  Packet packetOp(const Packet& x) const {
+    const Packet one = pset1<Packet>(T(1));
+    return pdiv(one, padd(one, pexp(pnegate(x))));
+  }
+};
+
+template <typename T>
+struct functor_traits<scalar_sigmoid_op<T> > {
+  enum {
+    Cost = NumTraits<T>::AddCost * 2 + NumTraits<T>::MulCost * 6,
+    PacketAccess = packet_traits<T>::HasAdd && packet_traits<T>::HasDiv &&
+                   packet_traits<T>::HasNegate && packet_traits<T>::HasExp
+  };
+};
+
+
 /** \internal
   * \brief Template functor to compute the opposite of a scalar
   *
-- 
cgit v1.2.3


From 8c82da65f90f7932f65db3d075062732db4372aa Mon Sep 17 00:00:00 2001
From: Miao Wang <miaowang@google.com>
Date: Fri, 28 Jul 2017 17:35:28 -0700
Subject: Make libeigen header only lib vendor available.

Bug: 63905942
Test: mm
Change-Id: Idfc5fbb14a226c2abc1cf1d56007eaca30ba63ee
---
 Android.bp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Android.bp b/Android.bp
index 78a86fb7d..6603f2bb6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,7 @@
 cc_library_headers {
   export_include_dirs = [ "." ],
   name: "libeigen",
+  vendor_available: true,
   host_supported: true,
 }
 
-- 
cgit v1.2.3


From aaa7c2fb4f9100b5c802049f4626e6bc500b5219 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Thu, 10 Aug 2017 20:04:55 +0900
Subject: Mark libF77blas as vendor_available

This is required by libblas, which is a vndk-sp library. Since this is a
static library, vendor_available: true is enough.

Bug: 64425518
Test: BOARD_VNDK_VERSION=current m -j libblas.vendor

Change-Id: I496a1f150719c15ac1c50508ebf9a097c5630347
---
 blas/Android.bp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blas/Android.bp b/blas/Android.bp
index 16d2f44a1..45a517814 100644
--- a/blas/Android.bp
+++ b/blas/Android.bp
@@ -47,6 +47,7 @@ cc_defaults {
 
 cc_library_static {
     name: "libF77blas",
+    vendor_available: true,
     defaults: ["eigen-defaults"],
     host_supported: true,
 }
-- 
cgit v1.2.3