numpy: fixed missing numpy wheel installing for Numpy.NET

Author: henon

src/CodeMinion.ApiGenerator/NumPy/ApiGenerator.cs

@@ -96,7 +96,8 @@ public ApiGenerator()
                 SharpToSharpConversions =
                 {
                     SpecialGenerators.ArrayToNDarrayConversion,
-                }
+                },
+                InitializationGenerators = { SpecialGenerators.InitNumpyGenerator },
             };
         }
 
@@ -117,7 +118,6 @@ public string Generate()
                 StaticName = "np", // name of the static API class
                 ImplName = "NumPy", // name of the singleton that implements the static API behind the scenes
                 PythonModule = "numpy", // name of the Python module that the static api wraps 
-                InitializationGenerators = { SpecialGenerators.InitNumpyGenerator },
             };
             _generator.StaticApis.Add(array_creation_api);
             ParseNumpyApi(array_creation_api, "routines.array-creation.html");
@@ -267,7 +267,7 @@ public string Generate()
             // generate Numpy.Bare
             // it is based on Python.Runtime only and doesn't pack anything. Python 3.7 installation including numpy pip module are required for this to run
             // ----------------------------------------------------
-            array_creation_api.InitializationGenerators = new List<Action<CodeWriter>>(); // <--- do not install wheel in numpy bare
+            _generator.InitializationGenerators = new List<Action<CodeWriter>>(); // <--- do not install wheel in numpy bare
             ndarray_api.OutputPath = Path.Combine(src_dir, "Numpy.Bare/Models");
             _generator.ModelsPath = Path.Combine(src_dir, "Numpy.Bare/Models");
             _generator.StaticApiFilesPath = Path.Combine(src_dir, "Numpy.Bare");

src/Numpy.Bare/np.io.gen.cs

@@ -484,7 +484,7 @@ public static void savetxt(string fname, NDarray X, string[] fmt = null, string
         ///	 If usemask is True, this is a
         ///	masked array.
         /// </returns>
-        public static NDarray genfromtxt(string fname, Dtype dtype = null, string comments = null, string delimiter = null, int? skiprows = null, int? skip_header = 0, int? skip_footer = 0, variable converters = null, variable missing = null, variable missing_values = null, variable filling_values = null, sequence usecols = null, {None names = null, sequence excludelist = null, string deletechars = null, string defaultfmt = "f%i", bool? autostrip = false, char replace_space = "_", {True case_sensitive = true, bool? unpack = null, bool? usemask = false, bool? loose = true, bool? invalid_raise = true, int? max_rows = null, string encoding = "bytes")
+        public static NDarray genfromtxt(string fname, Dtype dtype = null, string comments = null, string delimiter = null, int? skiprows = null, int? skip_header = 0, int? skip_footer = 0, variable converters = null, variable missing = null, variable missing_values = null, variable filling_values = null, sequence usecols = null, {None names = null, sequence excludelist = null, string deletechars = null, string defaultfmt = "f%i", bool? autostrip = false, string replace_space = "_", {True case_sensitive = true, bool? unpack = null, bool? usemask = false, bool? loose = true, bool? invalid_raise = true, int? max_rows = null, string encoding = "bytes")
         {
             //auto-generated code, do not change
             var __self__=self;
@@ -906,7 +906,7 @@ public static void array_str(NDarray a, int? max_line_width = null, int? precisi
         /// <returns>
         ///	The string representation of the floating point value
         /// </returns>
-        public static string format_float_positional(python float or numpy floating scalar x, non-negative integer or None precision = null, bool? unique = true, bool? fractional = true, one of ‘k’ trim = "k", bool? sign = false, non-negative integer pad_left = null, non-negative integer pad_right = null)
+        public static string format_float_positional(python float or numpy floating scalar x, non-negative integer or None precision = null, bool? unique = true, bool? fractional = true, string trim = "k", bool? sign = false, non-negative integer pad_left = null, non-negative integer pad_right = null)
         {
             //auto-generated code, do not change
             var __self__=self;
@@ -974,7 +974,7 @@ public static string format_float_positional(python float or numpy floating scal
         /// <returns>
         ///	The string representation of the floating point value
         /// </returns>
-        public static string format_float_scientific(python float or numpy floating scalar x, non-negative integer or None precision = null, bool? unique = true, one of ‘k’ trim = "k", bool? sign = false, non-negative integer pad_left = null, non-negative integer exp_digits = null)
+        public static string format_float_scientific(python float or numpy floating scalar x, non-negative integer or None precision = null, bool? unique = true, string trim = "k", bool? sign = false, non-negative integer pad_left = null, non-negative integer exp_digits = null)
         {
             //auto-generated code, do not change
             var __self__=self;

src/Numpy.Bare/np.linalg.gen.cs

@@ -549,7 +549,7 @@ public static NDarray einsum(string subscripts, NDarray[] operands, NDarray @out
         /// string_repr
         ///	A printable representation of the einsum path.
         /// </returns>
-        public static (list of tuples, string) einsum_path(string subscripts, NDarray[] operands, {bool optimize = "greedy")
+        public static (list of tuples, string) einsum_path(string subscripts, NDarray[] operands, string optimize = "greedy")
         {
             //auto-generated code, do not change
             var __self__=self;

src/Numpy/np.io.gen.cs

@@ -485,7 +485,7 @@ public static void savetxt(string fname, NDarray X, string[] fmt = null, string
         ///	 If usemask is True, this is a
         ///	masked array.
         /// </returns>
-        public static NDarray genfromtxt(string fname, Dtype dtype = null, string comments = null, string delimiter = null, int? skiprows = null, int? skip_header = 0, int? skip_footer = 0, variable converters = null, variable missing = null, variable missing_values = null, variable filling_values = null, sequence usecols = null, {None names = null, sequence excludelist = null, string deletechars = null, string defaultfmt = "f%i", bool? autostrip = false, char replace_space = "_", {True case_sensitive = true, bool? unpack = null, bool? usemask = false, bool? loose = true, bool? invalid_raise = true, int? max_rows = null, string encoding = "bytes")
+        public static NDarray genfromtxt(string fname, Dtype dtype = null, string comments = null, string delimiter = null, int? skiprows = null, int? skip_header = 0, int? skip_footer = 0, variable converters = null, variable missing = null, variable missing_values = null, variable filling_values = null, sequence usecols = null, {None names = null, sequence excludelist = null, string deletechars = null, string defaultfmt = "f%i", bool? autostrip = false, string replace_space = "_", {True case_sensitive = true, bool? unpack = null, bool? usemask = false, bool? loose = true, bool? invalid_raise = true, int? max_rows = null, string encoding = "bytes")
         {
             //auto-generated code, do not change
             var __self__=self;
@@ -907,7 +907,7 @@ public static void array_str(NDarray a, int? max_line_width = null, int? precisi
         /// <returns>
         ///	The string representation of the floating point value
         /// </returns>
-        public static string format_float_positional(python float or numpy floating scalar x, non-negative integer or None precision = null, bool? unique = true, bool? fractional = true, one of ‘k’ trim = "k", bool? sign = false, non-negative integer pad_left = null, non-negative integer pad_right = null)
+        public static string format_float_positional(python float or numpy floating scalar x, non-negative integer or None precision = null, bool? unique = true, bool? fractional = true, string trim = "k", bool? sign = false, non-negative integer pad_left = null, non-negative integer pad_right = null)
         {
             //auto-generated code, do not change
             var __self__=self;
@@ -975,7 +975,7 @@ public static string format_float_positional(python float or numpy floating scal
         /// <returns>
         ///	The string representation of the floating point value
         /// </returns>
-        public static string format_float_scientific(python float or numpy floating scalar x, non-negative integer or None precision = null, bool? unique = true, one of ‘k’ trim = "k", bool? sign = false, non-negative integer pad_left = null, non-negative integer exp_digits = null)
+        public static string format_float_scientific(python float or numpy floating scalar x, non-negative integer or None precision = null, bool? unique = true, string trim = "k", bool? sign = false, non-negative integer pad_left = null, non-negative integer exp_digits = null)
         {
             //auto-generated code, do not change
             var __self__=self;

src/Numpy/np.linalg.gen.cs

@@ -550,7 +550,7 @@ public static NDarray einsum(string subscripts, NDarray[] operands, NDarray @out
         /// string_repr
         ///	A printable representation of the einsum path.
         /// </returns>
-        public static (list of tuples, string) einsum_path(string subscripts, NDarray[] operands, {bool optimize = "greedy")
+        public static (list of tuples, string) einsum_path(string subscripts, NDarray[] operands, string optimize = "greedy")
         {
             //auto-generated code, do not change
             var __self__=self;

src/Numpy/np.module.gen.cs

@@ -37,6 +37,7 @@ private static PyObject InstallAndImport(bool force = false)
         {
             var installer = new Installer();
             installer.SetupPython(force).Wait();
+            installer.InstallWheel(typeof(NumPy).Assembly, "numpy-1.16.3-cp37-cp37m-win_amd64.whl").Wait();
             PythonEngine.Initialize();
             var mod = Py.Import("numpy");
             return mod;