yzhliu closed pull request #10707: [MXNET-357][WIP] New Scala API Design
(NDArray)
URL: https://github.com/apache/incubator-mxnet/pull/10707
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/scala-package/macros/src/main/scala/org/apache/mxnet/NDArrayMacro.scala
b/scala-package/macros/src/main/scala/org/apache/mxnet/NDArrayMacro.scala
index c26d14c1292..036b9ec4753 100644
--- a/scala-package/macros/src/main/scala/org/apache/mxnet/NDArrayMacro.scala
+++ b/scala-package/macros/src/main/scala/org/apache/mxnet/NDArrayMacro.scala
@@ -52,18 +52,6 @@ private[mxnet] object NDArrayMacro {
else ndarrayFunctions.filter(!_._1.startsWith("_contrib_"))
}
- val AST_NDARRAY_TYPE = Select(Select(Select(
- Ident(TermName("org")), TermName("apache")), TermName("mxnet")),
TypeName("NDArray"))
- val AST_TYPE_MAP_STRING_ANY = AppliedTypeTree(Ident(TypeName("Map")),
- List(Ident(TypeName("String")), Ident(TypeName("Any"))))
- val AST_TYPE_ANY_VARARG = AppliedTypeTree(
- Select(
- Select(Ident(termNames.ROOTPKG), TermName("scala")),
- TypeName("<repeated>")
- ),
- List(Ident(TypeName("Any")))
- )
-
val functionDefs = newNDArrayFunctions flatMap { case (funcName, funcProp)
=>
val functionScope = {
if (isContrib) Modifiers()
@@ -75,45 +63,15 @@ private[mxnet] object NDArrayMacro {
if (isContrib) funcName.substring(funcName.indexOf("_contrib_") +
"_contrib_".length())
else funcName
}
-
+ val termName = TermName(funcName)
// It will generate definition something like,
Seq(
+ // scalastyle:off
// def transpose(kwargs: Map[String, Any] = null)(args: Any*)
- DefDef(functionScope, TermName(newName), List(),
- List(
- List(
- ValDef(Modifiers(Flag.PARAM | Flag.DEFAULTPARAM),
TermName("kwargs"),
- AST_TYPE_MAP_STRING_ANY, Literal(Constant(null)))
- ),
- List(
- ValDef(Modifiers(), TermName("args"), AST_TYPE_ANY_VARARG,
EmptyTree)
- )
- ), TypeTree(),
- Apply(
- Ident(TermName("genericNDArrayFunctionInvoke")),
- List(
- Literal(Constant(funcName)),
- Ident(TermName("args")),
- Ident(TermName("kwargs"))
- )
- )
- ),
+ q"def $termName(kwargs: Map[String, Any] = null)(args: Any*) =
{genericNDArrayFunctionInvoke($funcName, args, kwargs)}",
// def transpose(args: Any*)
- DefDef(functionScope, TermName(newName), List(),
- List(
- List(
- ValDef(Modifiers(), TermName("args"), AST_TYPE_ANY_VARARG,
EmptyTree)
- )
- ), TypeTree(),
- Apply(
- Ident(TermName("genericNDArrayFunctionInvoke")),
- List(
- Literal(Constant(funcName)),
- Ident(TermName("args")),
- Literal(Constant(null))
- )
- )
- )
+ q"def $termName(args: Any*) = {genericNDArrayFunctionInvoke($funcName,
args, null)}"
+ // scalastyle:on
)
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
