Merge pull request #1 from njpipeorgan/paclet

move to paclet
njpipeorgan · Jan 2, 2020 · 38f6687 · 38f6687
2 parents 4a389a2 + f3f7351
commit 38f6687
Show file tree

Hide file tree

Showing 29 changed files with 99 additions and 3 deletions.
diff --git a/src/arithmetic.h → IncludeFiles/arithmetic.h b/src/arithmetic.h → IncludeFiles/arithmetic.h
diff --git a/src/arrayfn.h → IncludeFiles/arrayfn.h b/src/arrayfn.h → IncludeFiles/arrayfn.h
diff --git a/src/arrayview.h → IncludeFiles/arrayview.h b/src/arrayview.h → IncludeFiles/arrayview.h
diff --git a/src/boolean.h → IncludeFiles/boolean.h b/src/boolean.h → IncludeFiles/boolean.h
diff --git a/src/clause.h → IncludeFiles/clause.h b/src/clause.h → IncludeFiles/clause.h
diff --git a/src/complex.h → IncludeFiles/complex.h b/src/complex.h → IncludeFiles/complex.h
diff --git a/src/const.h → IncludeFiles/const.h b/src/const.h → IncludeFiles/const.h
diff --git a/src/control.h → IncludeFiles/control.h b/src/control.h → IncludeFiles/control.h
diff --git a/src/functional.h → IncludeFiles/functional.h b/src/functional.h → IncludeFiles/functional.h
diff --git a/src/integral.h → IncludeFiles/integral.h b/src/integral.h → IncludeFiles/integral.h
diff --git a/src/io.h → IncludeFiles/io.h b/src/io.h → IncludeFiles/io.h
diff --git a/src/iterator.h → IncludeFiles/iterator.h b/src/iterator.h → IncludeFiles/iterator.h
diff --git a/src/librarylink.h → IncludeFiles/librarylink.h b/src/librarylink.h → IncludeFiles/librarylink.h
diff --git a/src/linalgebra.h → IncludeFiles/linalgebra.h b/src/linalgebra.h → IncludeFiles/linalgebra.h
diff --git a/src/listable.h → IncludeFiles/listable.h b/src/listable.h → IncludeFiles/listable.h
diff --git a/src/macros.h → IncludeFiles/macros.h b/src/macros.h → IncludeFiles/macros.h
diff --git a/IncludeFiles/math_base.h b/IncludeFiles/math_base.h
@@ -0,0 +1,85 @@
+// Compiler from Wolfram Language to C++
+// 
+// Copyright 2019 Tianhuan Lu
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#pragma once
+
+#include <immintrin.h>
+
+#include "macros.h"
+#include "traits.h"
+#include "types.h"
+
+namespace wl
+{
+
+template<size_t Bytes, typename T>
+union _vec;
+
+template<typename T>
+union _vec<16u, T>
+{
+    static_assert(is_arithmetic_v<T>, WL_ERROR_INTERNAL);
+    using base_type = value_type_t<T>;
+    using storage_type =
+        std::conditional_t<std::is_same_v<base_type, double>, __m128d,
+        std::conditional_t<std::is_same_v<base_type, float>, __m128, __m128i>>;
+    storage_type data;
+    T values[16u / sizeof(T)];
+};
+
+template<size_t Bytes, typename T>
+union _vec
+{
+    static_assert(is_arithmetic_v<T>, WL_ERROR_INTERNAL);
+    using base_type = value_type_t<T>;
+    using storage_type =
+        std::conditional_t<std::is_same_v<base_type, double>, __m256d,
+        std::conditional_t<std::is_same_v<base_type, float>, __m256, __m256i>>;
+    storage_type data;
+    T values[16u / sizeof(T)];
+};
+
+template<typename YT, size_t XW, typename XT>
+auto _convert()
+{
+}
+
+//template<typename X, typename Y>
+//auto _add(const X& x, const Y& y)
+//{
+//    using XV = value_type_t<XT>;
+//    using YV = value_type_t<YT>;
+//    using C = common_type_t<XV, YV>;
+//    if constexpr (is_complex_v<XT>)
+//    {
+//        if constexpr (is_complex_v<YT>)
+//            return complex<C>(std::real(x) + std::real(y),
+//                std::imag(x) + std::imag(y));
+//        else
+//            return complex<C>(std::real(x) + cast<C>(y), std::imag(x));
+//    }
+//    else
+//    {
+//        if constexpr (is_complex_v<YT>)
+//            return complex<C>(cast<C>(x) + std::real(y), std::imag(y));
+//        else
+//            return cast<C>(cast<C>(x) + cast<C>(y));
+//    }
+//}
+
+}
+
diff --git a/src/math_compile.h → IncludeFiles/math_compile.h b/src/math_compile.h → IncludeFiles/math_compile.h
diff --git a/src/mathfunction.h → IncludeFiles/mathfunction.h b/src/mathfunction.h → IncludeFiles/mathfunction.h
diff --git a/src/ndarray.h → IncludeFiles/ndarray.h b/src/ndarray.h → IncludeFiles/ndarray.h
diff --git a/src/numerical.h → IncludeFiles/numerical.h b/src/numerical.h → IncludeFiles/numerical.h
diff --git a/src/random.h → IncludeFiles/random.h b/src/random.h → IncludeFiles/random.h
diff --git a/src/traits.h → IncludeFiles/traits.h b/src/traits.h → IncludeFiles/traits.h
diff --git a/src/types.h → IncludeFiles/types.h b/src/types.h → IncludeFiles/types.h
diff --git a/src/utils.h → IncludeFiles/utils.h b/src/utils.h → IncludeFiles/utils.h
diff --git a/src/view_derive.h → IncludeFiles/view_derive.h b/src/view_derive.h → IncludeFiles/view_derive.h
diff --git a/MathCompile.wl b/MathCompile.wl
@@ -915,7 +915,7 @@ loadfunction[libpath_String,funcid_String,args_]:=
   ]
 
 
-$template=Import[$packagepath<>"/src/src_template.cpp","Text"];
+$template=Import[$packagepath<>"/SourceFiles/src_template.cpp","Text"];
 
 Options[compilelink]={
   "LibraryDirectory"->"TargetDirectory"/.Options[CCompilerDriver`CreateLibrary],
@@ -952,7 +952,7 @@ compilelink[f_,uncompiled_,OptionsPattern[]]:=
           {"            ",",\n            ",""}],
         "funcid"->funcid
         |>];
-    If[FileExistsQ[$packagepath<>"/src/math_compile.h"]=!=True,
+    If[FileExistsQ[$packagepath<>"/IncludeFiles/math_compile.h"]=!=True,
       Message[link::noheader];Return[$Failed]];
     mldir=$InstallationDirectory<>
       "/SystemFiles/Links/MathLink/DeveloperKit/"<>$SystemID<>"/CompilerAdditions";
@@ -970,7 +970,7 @@ compilelink[f_,uncompiled_,OptionsPattern[]]:=
           OptionValue["CompileOptions"]
         },
       "CleanIntermediate"->!TrueQ@OptionValue["Debug"],
-      "IncludeDirectories"->{mldir,$packagepath<>"/src"},
+      "IncludeDirectories"->{mldir,$packagepath<>"/IncludeFiles"},
       "LibraryDirectories"->{mldir};
       "Libraries"->{"ML64i4"},
       "WorkingDirectory"->workdir,

diff --git a/PacletInfo.wl b/PacletInfo.wl
@@ -0,0 +1,11 @@
+(* ::Package:: *)
+
+Paclet[
+    Name -> "MathCompile",
+    Version -> "0.1.1",
+    WolframVersion -> "11.3+",
+    Updating -> Automatic,
+    Extensions -> {
+        {"Kernel", Root -> ".", Context -> {"MathCompile`"}}
+    }
+]
diff --git a/src/src_template.cpp → SourceFiles/src_template.cpp b/src/src_template.cpp → SourceFiles/src_template.cpp