Windows compat and a bugfix in CTrunc

Author: satfra

CMakeLists.txt

@@ -18,33 +18,13 @@ endif()
 # Install the Mathematica package
 # ##############################################################################
 
-if(WIN32)
-  message(FATAL_ERROR "Installation on Windows is not yet supported - on it!.")
-endif()
-
-set(WolframLanguage_wolframscript_EXE "")
-execute_process(
-  COMMAND bash -c "which wolframscript"
-  OUTPUT_VARIABLE WolframLanguage_wolframscript_EXE
-  ERROR_QUIET)
-if(WolframLanguage_wolframscript_EXE STREQUAL "")
-  execute_process(
-    COMMAND bash -c "which wolfram"
-    OUTPUT_VARIABLE WolframLanguage_wolframscript_EXE
-    ERROR_QUIET)
-endif()
-if(WolframLanguage_wolframscript_EXE STREQUAL "")
-  execute_process(
-    COMMAND bash -c "which math"
-    OUTPUT_VARIABLE WolframLanguage_wolframscript_EXE
-    ERROR_QUIET)
-endif()
+find_program(WolframLanguage_wolframscript_EXE NAMES wolframscript wolfram math)
 
 # See if the variable WolframLanguage_wolframscript_EXE is defined
 if(DEFINED ENV{WOLFRAM_SCRIPT})
   set(WolframLanguage_wolframscript_EXE $ENV{WOLFRAM_SCRIPT})
 elseif(NOT (WolframLanguage_wolframscript_EXE STREQUAL ""))
-  # nothing to do, we found it with which
+  # nothing to do, we found it with find_program
 else()
   set(WolframLanguage_wolframscript_EXE "")
 endif()
@@ -60,7 +40,11 @@ if(NOT DEFINED WolframLanguage_wolframscript_EXE
       SHA256=78ba32abdf798bc616bab7c73aac32a17bbd7b06ad9e26a6add69de8f3ae4791)
   include(${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake)
   if("${CPM_SOURCE_CACHE}" STREQUAL "OFF" OR NOT DEFINED CPM_SOURCE_CACHE)
-    set(CPM_SOURCE_CACHE $ENV{HOME}/.cache/CPM)
+    if(WIN32)
+      set(CPM_SOURCE_CACHE $ENV{LOCALAPPDATA}/CPM)
+    else()
+      set(CPM_SOURCE_CACHE $ENV{HOME}/.cache/CPM)
+    endif()
   endif()
   # Get codeparser
   cpmaddpackage(
@@ -130,51 +114,89 @@ install(
 # Testing
 # ##############################################################################
 
-add_custom_target(
-  test
-  COMMAND
-    ${WolframLanguage_wolframscript_EXE} -script
-    ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m | tee
-    ${CMAKE_CURRENT_BINARY_DIR}/test.log
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m
-  COMMENT "Running tests"
-  VERBATIM)
-
-# Run a single test file or directory:
-#   make test-single FILE=FEDeriK/FunctionalDTests.m
-#   make test-single FILE=FEDeriK
-# Note: $(FILE) is expanded by Make at build time, not by CMake at configure
-# time. VERBATIM is intentionally omitted so that Make resolves the variable.
-add_custom_target(
-  test-single
-  COMMAND
-    ${WolframLanguage_wolframscript_EXE} -script
-    ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m $(FILE) | tee
-    ${CMAKE_CURRENT_BINARY_DIR}/test.log
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m
-  COMMENT "Running tests")
+if(WIN32)
+  add_custom_target(
+    test
+    COMMAND
+      ${WolframLanguage_wolframscript_EXE} -script
+      ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m
+    COMMENT "Running tests"
+    VERBATIM)
+
+  add_custom_target(
+    test-single
+    COMMAND
+      ${WolframLanguage_wolframscript_EXE} -script
+      ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m $(FILE)
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m
+    COMMENT "Running tests")
+else()
+  add_custom_target(
+    test
+    COMMAND
+      ${WolframLanguage_wolframscript_EXE} -script
+      ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m | tee
+      ${CMAKE_CURRENT_BINARY_DIR}/test.log
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m
+    COMMENT "Running tests"
+    VERBATIM)
+
+  # Run a single test file or directory:
+  #   make test-single FILE=FEDeriK/FunctionalDTests.m
+  #   make test-single FILE=FEDeriK
+  # Note: $(FILE) is expanded by Make at build time, not by CMake at configure
+  # time. VERBATIM is intentionally omitted so that Make resolves the variable.
+  add_custom_target(
+    test-single
+    COMMAND
+      ${WolframLanguage_wolframscript_EXE} -script
+      ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m $(FILE) | tee
+      ${CMAKE_CURRENT_BINARY_DIR}/test.log
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests/Test.m
+    COMMENT "Running tests")
+endif()
 
 # ##############################################################################
 # Benchmarks
 # ##############################################################################
 
-add_custom_target(
-  bench
-  COMMAND
-    ${WolframLanguage_wolframscript_EXE} -script
-    ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m | tee
-    ${CMAKE_CURRENT_BINARY_DIR}/bench.log
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m
-  COMMENT "Running benchmarks"
-  VERBATIM)
-
-# Run a single benchmark file:
-#   make bench-single FILE=ScalarBench.m
-add_custom_target(
-  bench-single
-  COMMAND
-    ${WolframLanguage_wolframscript_EXE} -script
-    ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m $(FILE) | tee
-    ${CMAKE_CURRENT_BINARY_DIR}/bench.log
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m
-  COMMENT "Running benchmark")
+if(WIN32)
+  add_custom_target(
+    bench
+    COMMAND
+      ${WolframLanguage_wolframscript_EXE} -script
+      ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m
+    COMMENT "Running benchmarks"
+    VERBATIM)
+
+  add_custom_target(
+    bench-single
+    COMMAND
+      ${WolframLanguage_wolframscript_EXE} -script
+      ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m $(FILE)
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m
+    COMMENT "Running benchmark")
+else()
+  add_custom_target(
+    bench
+    COMMAND
+      ${WolframLanguage_wolframscript_EXE} -script
+      ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m | tee
+      ${CMAKE_CURRENT_BINARY_DIR}/bench.log
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m
+    COMMENT "Running benchmarks"
+    VERBATIM)
+
+  # Run a single benchmark file:
+  #   make bench-single FILE=ScalarBench.m
+  add_custom_target(
+    bench-single
+    COMMAND
+      ${WolframLanguage_wolframscript_EXE} -script
+      ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m $(FILE) | tee
+      ${CMAKE_CURRENT_BINARY_DIR}/bench.log
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/Benchmark.m
+    COMMENT "Running benchmark")
+endif()

FunKit.m

@@ -91,6 +91,12 @@
 StyleBox[\"dependencies\",\nFontSize->10,\nFontWeight->\"Plain\",\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\"...\",\nFontSize->10,\nFontWeight->\"Plain\",\nFontSlant->\"Italic\"]\)"];
 
+If[$OperatingSystem === "Windows" && !TrueQ[Global`$UseFORMOnWindows],
+Print["FunKit: Skipping TensorBases (not available on Windows without FORM). Set Global`$UseFORMOnWindows = True before loading FunKit to override."];
+,
+If[$OperatingSystem === "Windows" && TrueQ[Global`$UseFORMOnWindows],
+Print["FunKit: Loading TensorBases on Windows -- user has set Global`$UseFORMOnWindows = True. Ensure FormTracer/FORM are available."];
+];
 TensorBasesInstalled[]:=Module[{TensorBasesDirectory},
 TensorBasesDirectory=SelectFirst[
 Join[
@@ -125,6 +131,7 @@
 StyleBox[\"TensorBases\",\nFontSize->10,\nFontWeight->\"Bold\",\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\" \",\nFontSize->10,\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\"loaded\",\nFontSize->10,\nFontWeight->\"Plain\",\nFontSlant->\"Italic\"]\)"];
+];
 
 
 (* ::Input::Initialization:: *)
@@ -248,18 +255,26 @@
 StyleBox[\"DiANE\",\nFontSize->10,\nFontWeight->\"Bold\",\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\" \",\nFontSize->10,\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\"loaded\",\nFontSize->10,\nFontWeight->\"Plain\",\nFontSlant->\"Italic\"]\)"];
+If[$OperatingSystem === "Windows" && !TrueQ[Global`$UseFORMOnWindows],
+Print["FunKit: Skipping DiRK module (requires TensorBases). Set Global`$UseFORMOnWindows = True before loading FunKit to override."];
+,
 Get[$FunKitDirectory<>"modules/DiRK.m"];
 PrintTemporary["\!\(\*
 StyleBox[\"...\",\nFontSize->10,\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\"DiRK\",\nFontSize->10,\nFontWeight->\"Bold\",\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\" \",\nFontSize->10,\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\"loaded\",\nFontSize->10,\nFontWeight->\"Plain\",\nFontSlant->\"Italic\"]\)"];
+];
+If[$OperatingSystem === "Windows" && !TrueQ[Global`$UseFORMOnWindows],
+Print["FunKit: Skipping TRACY module (requires FORM/FormTracer). Set Global`$UseFORMOnWindows = True before loading FunKit to override."];
+,
 Get[$FunKitDirectory<>"modules/TRACY.m"];
 PrintTemporary["\!\(\*
 StyleBox[\"...\",\nFontSize->10,\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\"TRACY\",\nFontSize->10,\nFontWeight->\"Bold\",\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\" \",\nFontSize->10,\nFontSlant->\"Italic\"]\)\!\(\*
 StyleBox[\"loaded\",\nFontSize->10,\nFontWeight->\"Plain\",\nFontSlant->\"Italic\"]\)"];
+];
 Get[$FunKitDirectory<>"modules/COEN.m"];
 PrintTemporary["\!\(\*
 StyleBox[\"...\",\nFontSize->10,\nFontSlant->\"Italic\"]\)\!\(\*

PacletInfo.m

@@ -1,3 +1,3 @@
 (* ::Package:: *)
 
-PacletObject[<|"Name" -> "FunKit", "Version" -> "0.3.0", "WolframVersion" -> "11.0+", "Extensions" -> {{"Kernel", "Context" -> {{"FunKit`", "FunKit.m"}}}, {"Documentation", "Language" -> "English"}}|>]
+PacletObject[<|"Name" -> "FunKit", "Version" -> "0.3.1", "WolframVersion" -> "11.0+", "Extensions" -> {{"Kernel", "Context" -> {{"FunKit`", "FunKit.m"}}}, {"Documentation", "Language" -> "English"}}|>]

modules/COEN/Cpp.m

@@ -176,8 +176,8 @@
 clangFormatExists = Quiet[RunProcess[{"clang-format", "--help"}]] =!= $Failed;
 
 CreateClangFormat[path_:"./"] :=
-    If[Not @ FileExistsQ[path <> ".clang-format"],
-        Export[path <> "/.clang-format", "BasedOnStyle: LLVM
+    If[Not @ FileExistsQ[FileNameJoin[{path, ".clang-format"}]],
+        Export[FileNameJoin[{path, ".clang-format"}], "BasedOnStyle: LLVM
 UseTab: Never
 IndentWidth: 2
 TabWidth: 2
@@ -203,23 +203,23 @@
         If[clangFormatExists,
             preprocessed = wrapLargeStatementsForClangFormat[expression];
             Export[tmpfileName, preprocessed, "Text"];
-            CreateClangFormat["/tmp/"];
-            RunProcess[$SystemShell, All, "clang-format -style=file:/tmp/.clang-format " <> tmpfileName <> " > " <> tmpfileName <> "_formatted && mv " <> tmpfileName <> "_formatted " <> tmpfileName];
+            CreateClangFormat[$TemporaryDirectory];
+            Export[tmpfileName, RunProcess[{"clang-format", "-style=file:" <> FileNameJoin[{$TemporaryDirectory, ".clang-format"}], tmpfileName}, "StandardOutput"], "Text"];
             Export[tmpfileName, fixClangFormatOffIndentation[Import[tmpfileName, "Text"]], "Text"];
             ,
             Export[tmpfileName, expression, "Text"];
         ];
         If[FileExistsQ[fileName],
             If[Import[fileName, "Text"] == Import[tmpfileName, "Text"],
                 Message[WriteCodeToFile::unchanged, fileName];
-                RunProcess[$SystemShell, All, "rm " <> tmpfileName]
+                Quiet[DeleteFile[tmpfileName]]
                 ,
                 Message[WriteCodeToFile::exported, fileName];
-                RunProcess[$SystemShell, All, "mv " <> tmpfileName <> " " <> fileName]
+                RenameFile[tmpfileName, fileName]
             ]
             ,
             Message[WriteCodeToFile::exported, fileName];
-            RunProcess[$SystemShell, All, "mv " <> tmpfileName <> " " <> fileName]
+            RenameFile[tmpfileName, fileName]
         ]
     ];
 
@@ -289,24 +289,23 @@
 
 FormatCppCode[expression_String, OptionsPattern[]] :=
     Module[{tmpfileName1, tmpfileName2, preprocessed, output},
-        tmpfileName1 = "/tmp/in_" <> makeTemporaryFileName[];
-        tmpfileName2 = "/tmp/out_" <> makeTemporaryFileName[];
+        tmpfileName1 = FileNameJoin[{$TemporaryDirectory, "in_" <> makeTemporaryFileName[]}];
+        tmpfileName2 = FileNameJoin[{$TemporaryDirectory, "out_" <> makeTemporaryFileName[]}];
         If[clangFormatExists && TrueQ[OptionValue["Format"]],
             preprocessed = wrapLargeStatementsForClangFormat[expression];
             Export[tmpfileName1, preprocessed, "Text"];
-            (*RunProcess[$SystemShell, All, "rm /tmp/.clang-format"];*)
-            CreateClangFormat["/tmp/"];
-            RunProcess[$SystemShell, All, "clang-format -style=file:/tmp/.clang-format " <> tmpfileName1 <> " > " <> tmpfileName2];
+            CreateClangFormat[$TemporaryDirectory];
+            Export[tmpfileName2, RunProcess[{"clang-format", "-style=file:" <> FileNameJoin[{$TemporaryDirectory, ".clang-format"}], tmpfileName1}, "StandardOutput"], "Text"];
             ,
             Export[tmpfileName1, expression, "Text"];
         ];
         If[FileExistsQ[tmpfileName2],
             output = Import[tmpfileName2, "Text"];
             output = fixClangFormatOffIndentation[output];
-            RunProcess[$SystemShell, All, "rm " <> tmpfileName1 <> " " <> tmpfileName2];
+            Quiet[DeleteFile[{tmpfileName1, tmpfileName2}]];
             Return[output];
         ];
-        RunProcess[$SystemShell, All, "rm " <> tmpfileName1];
+        Quiet[DeleteFile[tmpfileName1]];
         Return[expression]
     ];
 
@@ -356,15 +355,18 @@
         Return[res];
     ];
 
+CppCodeFORM[___] /; ($OperatingSystem === "Windows" && !TrueQ[Global`$UseFORMOnWindows]) :=
+    (Message[FunKit::warning, "CppCodeFORM requires FORM/FormTracer, which is not available on Windows. Set Global`$UseFORMOnWindows = True to override."]; Abort[]);
+
 CppCodeFORM[expr_] :=
     Module[{origVars, tmpfileName, import},
         origVars = FormTracer`GetExtraVars[];
-        tmpfileName = "/tmp/FO_" <> makeTemporaryFileName[];
+        tmpfileName = FileNameJoin[{$TemporaryDirectory, "FO_" <> makeTemporaryFileName[]}];
         FormTracer`AddExtraVars @@ GetAllCustomSymbols[expr];
         FormTracer`FormTrace[expr // Rationalize, {}, {}, {tmpfileName, "O4"}];
         FormTracer`DefineExtraVars[origVars];
         import = Import[tmpfileName, "Text"];
-        RunProcess[$SystemShell, All, "rm " <> tmpfileName];
+        Quiet[DeleteFile[tmpfileName]];
         import // formatFORMCode
     ];
 

modules/COEN/Tools.m

@@ -28,37 +28,38 @@
 
 (**********************************************************************************
     bashrc, zshrc and zshprofile sourcing to infer PATH
+    (Unix only -- on Windows, PATH is already correct from the environment)
 **********************************************************************************)
 
-haveBashrc = 0 == RunProcess[$SystemShell, All, "source ~/.bashrc"]["ExitCode"];
-
-haveZshrc = 0 == RunProcess[$SystemShell, All, "source ~/.zshrc"]["ExitCode"];
-
-haveZshProfile = 0 == RunProcess[$SystemShell, All, "source ~/.zprofile"]["ExitCode"];
-
-inferredPATH = RunProcess[
-        $SystemShell
-        ,
-        All
-        ,
-        If[haveBashrc,
-                "source ~/.bashrc;"
-                ,
-                ""
-            ] <>
-            If[haveZshrc,
-                "source ~/.zshrc;"
+If[$OperatingSystem =!= "Windows",
+    Module[{haveBashrc, haveZshrc, haveZshProfile, inferredPATH},
+        haveBashrc = 0 == RunProcess[$SystemShell, All, "source ~/.bashrc"]["ExitCode"];
+        haveZshrc = 0 == RunProcess[$SystemShell, All, "source ~/.zshrc"]["ExitCode"];
+        haveZshProfile = 0 == RunProcess[$SystemShell, All, "source ~/.zprofile"]["ExitCode"];
+        inferredPATH = RunProcess[
+                $SystemShell
                 ,
-                ""
-            ] <>
-            If[haveZshProfile,
-                "source ~/.zprofile;"
+                All
                 ,
-                ""
-            ] <> " echo $PATH"
-    ]["StandardOutput"];
-
-SetEnvironment["PATH" -> inferredPATH];
+                If[haveBashrc,
+                        "source ~/.bashrc;"
+                        ,
+                        ""
+                    ] <>
+                    If[haveZshrc,
+                        "source ~/.zshrc;"
+                        ,
+                        ""
+                    ] <>
+                    If[haveZshProfile,
+                        "source ~/.zprofile;"
+                        ,
+                        ""
+                    ] <> " echo $PATH"
+            ]["StandardOutput"];
+        SetEnvironment["PATH" -> inferredPATH];
+    ];
+];
 
 (**********************************************************************************
     Parallel map with automatic fallback