Merge pull request #1028 from zickgraf/master

Support compiling CAP operations which are themselves operations or kernel functions

Author: zickgraf

CompilerForCAP/PackageInfo.g

@@ -10,7 +10,7 @@ SetPackageInfo( rec(
 
 PackageName := "CompilerForCAP",
 Subtitle := "Speed up computations in CAP categories",
-Version := "2022.09-02",
+Version := "2022.09-03",
 Date := Concatenation( "01/", ~.Version{[ 6, 7 ]}, "/", ~.Version{[ 1 .. 4 ]} ),
 License := "GPL-2.0-or-later",
 

CompilerForCAP/TODO

@@ -9,7 +9,6 @@ Features:
 
 * list expressions for logic templates
 * do not inline variables but only a reference to them for the logic to use
-* support compilation of operations
 * For categories with finitely many objects (or morphisms): detect parts of the code which can be precomputed, e.g. hom_structure_on_basis_paths in Algebroids.
 * unify deduplication and hoisting: hoisting in duplicate code can lead to different variable names, so the deduplication does not match anymore (partially fixed)
 * hoisting in the following situation:

CompilerForCAP/examples/CapJitCompiledCAPOperationAsEnhancedSyntaxTree.gi

@@ -0,0 +1,28 @@
+#! @Chapter Examples and tests
+
+#! @Section Tests
+
+#! @Example
+
+LoadPackage( "CompilerForCAP", false );
+#! true
+
+dummy := DummyCategory( rec(
+    list_of_operations_to_install := [
+        "IdentityMorphism",
+    ],
+) : FinalizeCategory := false );;
+
+AddIsProjective( dummy, ReturnTrue );
+
+Finalize( dummy );;
+
+Display( CapJitCompiledFunction(
+    { cat, obj } -> IsProjective( cat, obj ),
+    dummy
+) );
+#! function ( cat_1, obj_1 )
+#!     return RETURN_TRUE( cat_1, obj_1 );
+#! end
+
+#! @EndExample

CompilerForCAP/gap/CompileCAPOperation.gi

@@ -4,7 +4,7 @@
 # Implementations
 #
 InstallGlobalFunction( "CapJitCompiledCAPOperationAsEnhancedSyntaxTree", function ( cat, operation_name )
-  local index, function_to_compile, info, filter_list, return_type;
+  local index, function_to_compile, global_variable_name, info, return_type;
 
     if not (IsBound( cat!.category_as_first_argument ) and cat!.category_as_first_argument = true) then
 
@@ -41,8 +41,15 @@ InstallGlobalFunction( "CapJitCompiledCAPOperationAsEnhancedSyntaxTree", functio
 
         if IsOperation( function_to_compile ) or IsKernelFunction( function_to_compile ) then
 
-            # COVERAGE_IGNORE_NEXT_LINE
-            Error( "compiling operations or kernel functions is not supported." );
+            global_variable_name := CapJitGetOrCreateGlobalVariable( function_to_compile );
+            
+            function_to_compile := EvalString( ReplacedStringViaRecord(
+                "{ input_arguments } -> global_variable_name( input_arguments )",
+                rec(
+                    input_arguments := CAP_INTERNAL_METHOD_NAME_RECORD.(operation_name).input_arguments_names,
+                    global_variable_name := global_variable_name,
+                )
+            ) );
 
         fi;
 

CompilerForCAP/gap/InferDataTypes.gi

@@ -876,6 +876,7 @@ CapJitAddTypeSignature( "Range", [ IsCapCategoryMorphism ], function ( input_typ
 end );
 
 # GAP operations
+CapJitAddTypeSignature( "RETURN_TRUE", [ IsObject, IsObject ], IsBool );
 CapJitAddTypeSignature( "Length", [ IsList ], IsInt );
 CapJitAddTypeSignature( "+", [ IsInt, IsInt ], IsInt );
 CapJitAddTypeSignature( "-", [ IsInt, IsInt ], IsInt );