Added C++ layer for vanilla mlp.

 Changes to be committed:
	modified:   CMakeLists.txt
	modified:   cmake/Core.cmake
	modified:   inc/ae2f/Ann/Util.h
	modified:   src/ann/Conv.imp.c
	modified:   src/ann/Mlp.def.cc
	new file:   src/ann/Mlp.imp.c
	modified:   src/ann/Slp.def.cc
	modified:   src/ann/Slp.imp.c
	deleted:    src/ann/Sp.c
	modified:   src/mmap/MMap.def.c
	modified:   src/mmap/MMap.imp.c
	modified:   test.sh
	modified:   test/ann/Conv.c
	new file:   test/ann/MlpTrainXOR-Made-Primal.c
	modified:   test/ann/MlpTrainXOR-Primal.c
	new file:   test/ann/MlpTrainXOR-Primal.cc
	new file:   test/ann/MlpTrainXOR.c

Author: Dalmurii

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 enable_testing()
 option(ae2f_CXX "" ON)
-option(ae2fCL_needed "" OFF)
+option(ae2fVK_needed "" OFF)
 option(ae2f_TEST "" ON)
 option(ae2f_MAC_BUILD "" ON)
 option(ae2f_IS_SHARED "" OFF)
@@ -23,34 +23,32 @@ else()
 	function(ae2f_itll tar)
 		target_link_libraries(${tar} INTERFACE ${ARGN})
 	endfunction()
-
 endif()
 
-if(NOT TARGET ae2f::${PROJECT_NAME})
+if(NOT TARGET ae2f::MMap)
 	ae2f_CoreLibFetchX(ae2f Core	main)
-	ae2f_CoreLibFetchX(ae2f Macro	main)
+	ae2f_CoreLibFetchX(ae2f Preproc	main)
 
 	file(GLOB mmap-inc ${PROJECT_SOURCE_DIR}/inc/ae2f/MMap/*.h)
 	configure_file(${PROJECT_SOURCE_DIR}/src/mmap/Util.h.in ${PROJECT_SOURCE_DIR}/inc/ae2f/MMap/Util.h)
 
-	ae2f_Macro_init(1, 100, 100)
+	ae2f_Macro_init(1 100 100)
 
 	ae2f_Macro_Lib_V(
 		ae2f MMap "${ae2f_LIBPREFIX}" 
 		${PROJECT_SOURCE_DIR}/src/mmap "*.imp.c" 
 		${PROJECT_SOURCE_DIR}/src/mmap "*.def.c" 
 		${PROJECT_SOURCE_DIR}/inc/ae2f/MMap ".h"
-
 		${PROJECT_SOURCE_DIR}/Config/MMap.cmake.in inc
 		${mmap-inc}
 	)
 
-	ae2f_itll(${ae2f__MMap__TENT} ${ae2f__Core__FETCHED})
-	ae2f_itll(${ae2f__MMap__TENT} ${ae2f__Macro__FETCHED})
+	ae2f_itll(${ae2f__MMap__TENT} ae2f::Core)
+	ae2f_itll(${ae2f__MMap__TENT} ae2f::Preproc)
 endif()
 
 project(Ann VERSION 0.0.0 LANGUAGES C CXX)
-if(NOT TARGET ae2f::${PROJECT_NAME})
+if(NOT TARGET ae2f::Ann)
 	file(GLOB Ann-inc ${PROJECT_SOURCE_DIR}/inc/ae2f/Ann/*.h)
 
 	ae2f_Macro_Lib_V(
@@ -66,79 +64,6 @@ if(NOT TARGET ae2f::${PROJECT_NAME})
 	ae2f_CoreTestTent(${ae2f__Ann__TENT} "test/ann")
 endif()
 
-if(ae2fCL_needed)
-	project(CL-Ann VERSION 3.3.4 LANGUAGES C CXX)
-	if(NOT TARGET ${PROJECT_NAME})
-		ae2f_CoreLibFetchX(ae2f Ruler		main)
-		ae2f_CoreLibFetchX(ae2f Ann 		None)
-		ae2f_CoreLibFetchX(ae2f Ann-H 		None)
-		ae2f_CoreLibFetchX(ae2f Ann-H-Private 	None)
-		find_package(OpenCL REQUIRED)
-
-		ae2f_CoreLibFetchX_NS(ae2f ae2fCL CL-Core	Rel-v4.15.21)
-
-		ae2f_CoreLibTentConfigCustom(
-			CL-Ann-H INTERFACE
-			include ae2fCL
-			${PROJECT_SOURCE_DIR}/Config/CL-Ann-H.cmake.in
-			"include/ae2fCL/Ann.h"
-
-			"include/ae2fCL/Ann/Sp.h.cxx/Sp.hh"
-			"include/ae2fCL/Ann/Sp.h.cxx/mSp.hh"
-			"include/ae2fCL/Ann/Sp.h.cxx/imp.hh"
-			"include/ae2fCL/Ann/Sp.h"
-
-			"include/ae2fCL/Ann/Slp.h.cxx/Slp.hh"
-			"include/ae2fCL/Ann/Slp.h.cxx/mSlp.hh"
-			"include/ae2fCL/Ann/Slp.h.cxx/imp.hh"
-			"include/ae2fCL/Ann/Slp.h"
-		)
-
-		ae2f_RulerMeasure(
-			cl_mem 
-			${PROJECT_SOURCE_DIR}/src/cl/CLCode/Size/cl_mem.auto.h 
-			-I${OpenCL_INCLUDE_DIR} 
-			CL/cl.h
-		)
-
-		ae2f_RulerMeasure(
-			ae2f_float_t 
-			${PROJECT_SOURCE_DIR}/src/cl/CLCode/Size/ae2f_float_t.auto.h 
-			-I${PROJECT_SOURCE_DIR}/submod/ae2f/Core/include/ae2f 
-			Float.h
-		)
-
-		ae2f_CoreLibTentConfigCustom(
-			CL-Ann ${ae2f_LIBPREFIX}
-			include ae2fCL
-			${PROJECT_SOURCE_DIR}/Config/CL-Ann.cmake.in
-			"src/cl/Ann.c"
-			"src/cl/Sp.c"
-			"src/cl/Slp.c"
-			"src/cl/Mlp.c"
-			"src/cl/CLCode/Size/ae2f_float_t.auto.h"
-			"src/cl/CLCode/Size/cl_mem.auto.h"
-		)
-		target_link_libraries(CL-Ann-H INTERFACE ${ae2f__Ann-H__FETCHED})
-		target_link_libraries(CL-Ann-H INTERFACE ${ae2f__ae2fCL__CL-Core__FETCHED})
-		target_link_libraries(CL-Ann PUBLIC CL-Ann-H)
-		target_link_libraries(CL-Ann PUBLIC ${ae2f__Ann-H-Private__FETCHED})
-		target_link_libraries(CL-Ann PUBLIC ${ae2f__Ann__FETCHED})
-		target_link_libraries(CL-Ann PUBLIC OpenCL::OpenCL)
-
-		ae2fCL_CoreAppendInclude(
-			${PROJECT_SOURCE_DIR}/include
-			${ae2f_ProjRoot}/submod/ae2f/Core/include
-			${ae2f_ProjRoot}/submod/ae2f/CL-Core/include
-		)
-		message(${OpenCL_INCLUDE_DIR}/CL/cl.h)
-
-		ae2fCL_CoreAddConfProjTarDep(
-			CL-Ann
-			"${PROJECT_SOURCE_DIR}/src/cl/CLCode"
-		)
-
-		ae2fCL_CoreTestTent(CL-Ann "test/cl-src")
-
-	endif()
+if(ae2fVK_needed)
+	ae2f_CoreLibFetchX(ae2f VK-Core	main)
 endif()

cmake/Core.cmake

@@ -11,9 +11,9 @@ set(ae2f_BinRoot ${CMAKE_CURRENT_BINARY_DIR} CACHE STRING "Current Binary Root")
 set(ae2f_submod  submod CACHE STRING submod)
 
 if(ae2f_IS_SHARED)
-    set(ae2f_LIBPREFIX SHARED CACHE STRING "SHARED")
+	set(ae2f_LIBPREFIX SHARED CACHE STRING "SHARED")
 else()
-    set(ae2f_LIBPREFIX STATIC CACHE STRING "STATIC")
+	set(ae2f_LIBPREFIX STATIC CACHE STRING "STATIC")
 endif()
 
 # @namespace ___DOC_CMAKE
@@ -36,24 +36,24 @@ endif()
 # 
 # @see ___DOC_CMAKE::ae2f_TEST
 function(ae2f_CoreTestTent prm_LibName prm_TestSourcesDir)
-    if(ae2f_TEST)
-        if(ae2f_CXX)
-            file(GLOB_RECURSE files "${prm_TestSourcesDir}/*")
-        else()
-            file(GLOB_RECURSE files "${prm_TestSourcesDir}/*.c")
-        endif()
-        list(LENGTH files list_length)
-        
-        math(EXPR adjusted_length "${list_length} - 1")
+	if(ae2f_TEST)
+		if(ae2f_CXX)
+			file(GLOB_RECURSE files "${prm_TestSourcesDir}/*")
+		else()
+			file(GLOB_RECURSE files "${prm_TestSourcesDir}/*.c")
+		endif()
+		list(LENGTH files list_length)
 
-        foreach(i RANGE 0 ${adjusted_length})
-            list(GET files ${i} item)
-            get_filename_component(__NAME ${item} NAME)
-            add_executable("${prm_LibName}-Test-${__NAME}" ${item})
-            target_link_libraries("${prm_LibName}-Test-${__NAME}" ${ARGN} ${prm_LibName})
-            add_test(NAME "${prm_LibName}-Test-${__NAME}" COMMAND "${prm_LibName}-Test-${__NAME}")
-        endforeach()
-    endif()
+		math(EXPR adjusted_length "${list_length} - 1")
+
+		foreach(i RANGE 0 ${adjusted_length})
+			list(GET files ${i} item)
+			get_filename_component(__NAME ${item} NAME)
+			add_executable("${prm_LibName}-Test-${__NAME}" ${item})
+			target_link_libraries("${prm_LibName}-Test-${__NAME}" ${ARGN} ${prm_LibName})
+			add_test(NAME "${prm_LibName}-Test-${__NAME}" COMMAND "${prm_LibName}-Test-${__NAME}")
+		endforeach()
+	endif()
 endfunction()
 
 # @brief
@@ -78,54 +78,54 @@ endfunction()
 # @param ...
 # The sources for the project.
 function(ae2f_CoreLibTentConfigCustom prm_TarName prm_TarPreFix prm_includeDir prm_namespace prm_configpath)
-    # Namespace Package
-    include(GNUInstallDirs)
+	# Namespace Package
+	include(GNUInstallDirs)
+
+	include_directories(${prm_includeDir})
+	add_library(${prm_namespace}-${prm_TarName} ${prm_TarPreFix} ${ARGN})
+	add_library(${prm_namespace}::${prm_TarName} ALIAS ${prm_namespace}-${prm_TarName})
+
+	if(${ae2f_nakedalais})
+		add_library(${prm_TarName} ALIAS ${prm_namespace}-${prm_TarName})
+	endif()
 
-    include_directories(${prm_includeDir})
-    add_library(${prm_namespace}-${prm_TarName} ${prm_TarPreFix} ${ARGN})
-    add_library(${prm_namespace}::${prm_TarName} ALIAS ${prm_namespace}-${prm_TarName})
+	target_include_directories(
+		${prm_namespace}-${prm_TarName} INTERFACE
+		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${prm_includeDir}/>  
+		$<INSTALL_INTERFACE:${prm_includeDir}/${prm_namespace}/>
+	)
 
-    if(${ae2f_nakedalais})
-        add_library(${prm_TarName} ALIAS ${prm_namespace}-${prm_TarName})
-    endif()
+	# Install Settings
+	install(TARGETS ${prm_namespace}-${prm_TarName}
+		EXPORT ${prm_namespace}-${prm_TarName}Targets
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-    target_include_directories(
-        ${prm_namespace}-${prm_TarName} INTERFACE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${prm_includeDir}/>  
-        $<INSTALL_INTERFACE:${prm_includeDir}/${prm_namespace}/>
-    )
+	install(DIRECTORY ${prm_includeDir}/${prm_namespace}
+		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${prm_namespace}
+	)
 
-    # Install Settings
-    install(TARGETS ${prm_namespace}-${prm_TarName}
-        EXPORT ${prm_namespace}-${prm_TarName}Targets
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-        
-    install(DIRECTORY ${prm_includeDir}/${prm_namespace}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${prm_namespace}
-    )
+	# Package
+	install(EXPORT ${prm_namespace}-${prm_TarName}Targets
+		FILE ${prm_namespace}-${prm_TarName}Targets.cmake
+		NAMESPACE ae2f::
+		DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/
+	)
+
+	# Pack Conf
+	include(CMakePackageConfigHelpers)
+	configure_package_config_file(
+		${prm_configpath}
+		${CMAKE_CURRENT_BINARY_DIR}/${prm_namespace}-${prm_TarName}Config.cmake
+		INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/
+	)
 
-    # Package
-    install(EXPORT ${prm_namespace}-${prm_TarName}Targets
-        FILE ${prm_namespace}-${prm_TarName}Targets.cmake
-        NAMESPACE ae2f::
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/
-    )
-        
-    # Pack Conf
-    include(CMakePackageConfigHelpers)
-    configure_package_config_file(
-        ${prm_configpath}
-        ${CMAKE_CURRENT_BINARY_DIR}/${prm_namespace}-${prm_TarName}Config.cmake
-        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/
-    )
-        
-    install(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/${prm_namespace}-${prm_TarName}Config.cmake
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
-    )
+	install(FILES
+		${CMAKE_CURRENT_BINARY_DIR}/${prm_namespace}-${prm_TarName}Config.cmake
+		DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
+	)
 
-    set(${prm_namespace}__${prm_TarName}__TENT ${prm_namespace}-${prm_TarName} CACHE STRING ${prm_namespace}-${prm_TarName})
+	set(${prm_namespace}__${prm_TarName}__TENT ${prm_namespace}-${prm_TarName} CACHE STRING ${prm_namespace}-${prm_TarName})
 endfunction()
 
 # @brief
@@ -146,14 +146,14 @@ endfunction()
 # @param ...
 # The sources for the project.
 function(ae2f_CoreLibTent prm_TarName prm_TarPreFix prm_includeDir prm_namespace)
-    ae2f_CoreLibTentConfigCustom(
-        ${prm_TarName} 
-        ${prm_TarPreFix} 
-        ${prm_includeDir} 
-        ${prm_namespace} 
-        ${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
-        ${ARGN}
-    )
+	ae2f_CoreLibTentConfigCustom(
+		${prm_TarName} 
+		${prm_TarPreFix} 
+		${prm_includeDir} 
+		${prm_namespace} 
+		${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
+		${ARGN}
+	)
 endfunction()
 
 # @brief
@@ -175,43 +175,43 @@ endfunction()
 # @see ___DOC_CMAKE::ae2f_CoreLibTent
 # @see ___DOC_CMAKE::ae2f_DOC
 function(ae2f_CoreUtilityDocTent prm_TarName prm_includeDir prm_namespace)
-    if(ae2f_DOC)
-        file(GLOB_RECURSE src ${prm_includeDir} "*.cmake.hpp")
-        ae2f_CoreLibTent(${prm_TarName}-CMakeDoc INTERFACE ${prm_includeDir} ${prm_namespace}doc ${src})
-        foreach(lib ${ARGN})
-            target_link_libraries(${prm_TarName}-CMakeDoc INTERFACE ${lib}-CMakeDoc)
-        endforeach()
-    endif()
+	if(ae2f_DOC)
+		file(GLOB_RECURSE src ${prm_includeDir} "*.cmake.hpp")
+		ae2f_CoreLibTent(${prm_TarName}-CMakeDoc INTERFACE ${prm_includeDir} ${prm_namespace}doc ${src})
+		foreach(lib ${ARGN})
+			target_link_libraries(${prm_TarName}-CMakeDoc INTERFACE ${lib}-CMakeDoc)
+		endforeach()
+	endif()
 endfunction()
 
 # Domain name customization.
 function(ae2f_CoreLibFetch_DNS prm_AuthorName prm_namespace prm_TarName prm_TagName prm_Domain)
-    if(NOT TARGET ${prm_TarName})
-        if(NOT EXISTS ${ae2f_ProjRoot}/${ae2f_submod}/${prm_AuthorName}/${prm_TarName}/CMakeLists.txt)
-            execute_process(
-                COMMAND 
-                git clone 
-		https://${prm_Domain}/${prm_AuthorName}/${prm_TarName} 
-                ${ae2f_ProjRoot}/${ae2f_submod}/${prm_AuthorName}/${prm_TarName}
-		--branch ${prm_TagName} ${ARGN}
-                RESULT_VARIABLE result
-            )
+	if(NOT TARGET ${prm_namespace}::${prm_TarName})
+		if(NOT EXISTS ${ae2f_ProjRoot}/${ae2f_submod}/${prm_AuthorName}/${prm_TarName}/CMakeLists.txt)
+			execute_process(
+				COMMAND 
+				git clone 
+				https://${prm_Domain}/${prm_AuthorName}/${prm_TarName} 
+				${ae2f_ProjRoot}/${ae2f_submod}/${prm_AuthorName}/${prm_TarName}
+				--branch ${prm_TagName} ${ARGN}
+				RESULT_VARIABLE result
+			)
 
-            if(result)
-                message(FATAL_ERROR "Fetching ${prm_AuthorName}/${prm_TarName} from Github Failed.")
-            endif()
-        endif()
+			if(result)
+				message(FATAL_ERROR "Fetching ${prm_AuthorName}/${prm_TarName} from Github Failed.")
+			endif()
+		endif()
 
-        add_subdirectory(
-            ${ae2f_ProjRoot}/${ae2f_submod}/${prm_AuthorName}/${prm_TarName}
-            ${ae2f_BinRoot}/${ae2f_submod}/${prm_AuthorName}/${prm_TarName}
-        )
-    endif()
+		add_subdirectory(
+			${ae2f_ProjRoot}/${ae2f_submod}/${prm_AuthorName}/${prm_TarName}
+			${ae2f_BinRoot}/${ae2f_submod}/${prm_AuthorName}/${prm_TarName}
+		)
+	endif()
 
-    set(
-	    ${prm_AuthorName}__${prm_namespace}__${prm_TarName}__FETCHED 
-	    ${prm_namespace}::${prm_TarName} CACHE STRING ${prm_namespace}::${prm_TarName}
-    )
+	set(
+		${prm_AuthorName}__${prm_namespace}__${prm_TarName}__FETCHED 
+		${prm_namespace}::${prm_TarName} CACHE STRING ${prm_namespace}::${prm_TarName}
+	)
 
 endfunction()
 

inc/ae2f/Ann/Util.h

@@ -8,8 +8,14 @@
 #define ae2f_AnnUtilPtr2Name(A_t, B_t) \
 	ae2f_AnnUtilPtr__##A_t##B_t
 
+#define ae2f_AnnUtilV2Name(A_t, B_t) \
+	ae2f_AnnUtilV2Name__##A_t##B_t
 
-#define ae2f_AnnUtilPtr2(A_t, B_t) \
+#define ae2f_AnnUtilV2(A_LEFT, A_t, A_POST, B_LEFT, B_t, B_POST) \
+	ae2f_structdef(union, ae2f_AnnUtilV2Name(A_t, B_t)) \
+{ A_LEFT A_t A_POST a; B_LEFT B_t B_POST b; }
+
+#define ae2f_AnnUtilPtr2(A_t, B_t, ...) \
 	ae2f_structdef(union, ae2f_AnnUtilPtr2Name(A_t, B_t)) \
 { A_t* a; B_t* b; }