Improve native build and mark our official build as CFS Clean (dotnet#7516)

* Pass additional settings when compiling native binaries

* Mark our build as CFSClean

(cherry picked from commit 2cdb7e0)

Author: ericstj

src/Microsoft.ML.Core/Data/IHostEnvironment.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.ML.Data;
+using Microsoft.ML;
 
 namespace Microsoft.ML.Runtime;
 
@@ -115,6 +116,11 @@ internal interface IHostEnvironmentInternal : IHostEnvironment
     T GetOptionOrDefault<T>(string name);
 
     bool RemoveOption(string name);
+
+    /// <summary>
+    /// Global random source underpinning this environment.
+    /// </summary>
+    IRandomSource RandomSource { get; }
 }
 
 /// <summary>
@@ -129,6 +135,11 @@ public interface IHost : IHostEnvironment
     /// generators are NOT thread safe.
     /// </summary>
     Random Rand { get; }
+
+    /// <summary>
+    /// The random source backing <see cref="Rand"/>.
+    /// </summary>
+    IRandomSource RandomSource { get; }
 }
 
 /// <summary>

src/Microsoft.ML.Core/Environment/ConsoleEnvironment.cs

@@ -1,11 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using Microsoft.ML;
+
 
 namespace Microsoft.ML.Runtime;
 
@@ -359,14 +361,16 @@ protected override void Dispose(bool disposing)
     /// </summary>
     /// <param name="seed">Random seed. Set to <c>null</c> for a non-deterministic environment.</param>
     /// <param name="verbose">Set to <c>true</c> for fully verbose logging.</param>
+    /// <param name="randomSource">Optional random source backing this environment.</param>
     /// <param name="sensitivity">Allowed message sensitivity.</param>
     /// <param name="outWriter">Text writer to print normal messages to.</param>
     /// <param name="errWriter">Text writer to print error messages to.</param>
     /// <param name="testWriter">Optional TextWriter to write messages if the host is a test environment.</param>
     public ConsoleEnvironment(int? seed = null, bool verbose = false,
+        IRandomSource randomSource = null,
         MessageSensitivity sensitivity = MessageSensitivity.All,
         TextWriter outWriter = null, TextWriter errWriter = null, TextWriter testWriter = null)
-        : base(seed, verbose, nameof(ConsoleEnvironment))
+        : base(seed, verbose, randomSource, nameof(ConsoleEnvironment))
     {
         Contracts.CheckValueOrNull(outWriter);
         Contracts.CheckValueOrNull(errWriter);
@@ -391,13 +395,14 @@ private void PrintMessage(IMessageSource src, ChannelMessage msg)
         Root._consoleWriter.PrintMessage(src, msg);
     }
 
-    protected override IHost RegisterCore(HostEnvironmentBase<ConsoleEnvironment> source, string shortName, string parentFullName, Random rand, bool verbose)
+    protected override IHost RegisterCore(HostEnvironmentBase<ConsoleEnvironment> source, string shortName, string parentFullName, Random rand, IRandomSource randomSource, bool verbose)
     {
         Contracts.AssertValue(rand);
+        Contracts.AssertValue(randomSource);
         Contracts.AssertValueOrNull(parentFullName);
         Contracts.AssertNonEmpty(shortName);
         Contracts.Assert(source == this || source is Host);
-        return new Host(source, shortName, parentFullName, rand, verbose);
+        return new Host(source, shortName, parentFullName, rand, randomSource, verbose);
     }
 
     protected override IChannel CreateCommChannel(ChannelProviderBase parent, string name)
@@ -462,8 +467,8 @@ public void Dispose()
 
     private sealed class Host : HostBase
     {
-        public Host(HostEnvironmentBase<ConsoleEnvironment> source, string shortName, string parentFullName, Random rand, bool verbose)
-            : base(source, shortName, parentFullName, rand, verbose)
+        public Host(HostEnvironmentBase<ConsoleEnvironment> source, string shortName, string parentFullName, Random rand, IRandomSource randomSource, bool verbose)
+            : base(source, shortName, parentFullName, rand, randomSource, verbose)
         {
             IsCanceled = source.IsCanceled;
         }
@@ -484,9 +489,11 @@ protected override IPipe<TMessage> CreatePipe<TMessage>(ChannelProviderBase pare
             return new Pipe<TMessage>(parent, name, GetDispatchDelegate<TMessage>());
         }
 
-        protected override IHost RegisterCore(HostEnvironmentBase<ConsoleEnvironment> source, string shortName, string parentFullName, Random rand, bool verbose)
+        protected override IHost RegisterCore(HostEnvironmentBase<ConsoleEnvironment> source, string shortName, string parentFullName, Random rand, IRandomSource randomSource, bool verbose)
         {
-            return new Host(source, shortName, parentFullName, rand, verbose);
+            return new Host(source, shortName, parentFullName, rand, randomSource, verbose);
         }
     }
 }
+
+

src/Microsoft.ML.Core/Environment/HostEnvironmentBase.cs

@@ -1,11 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
+using Microsoft.ML;
+using Microsoft.ML.Internal.Utilities;
 
 namespace Microsoft.ML.Runtime;
 
@@ -121,8 +123,8 @@ public abstract class HostBase : HostEnvironmentBase<TEnv>, IHost
 
         public Random Rand => _rand;
 
-        public HostBase(HostEnvironmentBase<TEnv> source, string shortName, string parentFullName, Random rand, bool verbose)
-            : base(source, rand, verbose, shortName, parentFullName)
+        public HostBase(HostEnvironmentBase<TEnv> source, string shortName, string parentFullName, Random rand, IRandomSource randomSource, bool verbose)
+            : base(source, rand, randomSource ?? new RandomSourceAdapter(rand), verbose, shortName, parentFullName)
         {
             Depth = source.Depth + 1;
         }
@@ -140,7 +142,8 @@ public HostBase(HostEnvironmentBase<TEnv> source, string shortName, string paren
             {
                 _children.RemoveAll(r => r.TryGetTarget(out IHost _) == false);
                 Random rand = (seed.HasValue) ? RandomUtils.Create(seed.Value) : RandomUtils.Create(_rand);
-                host = RegisterCore(this, name, Master?.FullName, rand, verbose ?? Verbose);
+                IRandomSource randomSource = new RandomSourceAdapter(rand);
+                host = RegisterCore(this, name, Master?.FullName, rand, randomSource, verbose ?? Verbose);
                 if (!IsCanceled)
                     _children.Add(new WeakReference<IHost>(host));
             }
@@ -338,6 +341,8 @@ public void RemoveListener(Action<IMessageSource, TMessage> listenerFunc)
     protected Dictionary<string, object> Options { get; } = [];
 #pragma warning restore MSML_NoInstanceInitializers
 
+    public IRandomSource RandomSource => _randomSource;
+
     protected readonly TEnv Root;
     // This is non-null iff this environment was a fork of another. Disposing a fork
     // doesn't free temp files. That is handled when the master is disposed.
@@ -348,6 +353,7 @@ public void RemoveListener(Action<IMessageSource, TMessage> listenerFunc)
 
     // The random number generator for this host.
     private readonly Random _rand;
+    private readonly IRandomSource _randomSource;
 
     public int? Seed { get; }
 
@@ -369,11 +375,22 @@ public void RemoveListener(Action<IMessageSource, TMessage> listenerFunc)
     /// The main constructor.
     /// </summary>
     protected HostEnvironmentBase(int? seed, bool verbose,
+        IRandomSource randomSource = null,
         string shortName = null, string parentFullName = null)
         : base(shortName, parentFullName, verbose)
     {
         Seed = seed;
-        _rand = RandomUtils.Create(Seed);
+        if (randomSource is null)
+        {
+            var baseRandom = RandomUtils.Create(Seed);
+            _rand = baseRandom;
+            _randomSource = new RandomSourceAdapter(baseRandom);
+        }
+        else
+        {
+            _randomSource = randomSource;
+            _rand = randomSource as Random ?? new RandomFromRandomSource(randomSource);
+        }
         ListenerDict = new ConcurrentDictionary<Type, Dispatcher>();
         ProgressTracker = new ProgressReporting.ProgressTracker(this);
         _cancelLock = new object();
@@ -385,13 +402,14 @@ protected HostEnvironmentBase(int? seed, bool verbose,
     /// <summary>
     /// This constructor is for forking.
     /// </summary>
-    protected HostEnvironmentBase(HostEnvironmentBase<TEnv> source, Random rand, bool verbose,
+    protected HostEnvironmentBase(HostEnvironmentBase<TEnv> source, Random rand, IRandomSource randomSource, bool verbose,
         string shortName = null, string parentFullName = null)
         : base(shortName, parentFullName, verbose)
     {
         Contracts.CheckValue(source, nameof(source));
         Contracts.CheckValueOrNull(rand);
-        _rand = rand ?? RandomUtils.Create();
+        _randomSource = randomSource ?? (rand != null ? new RandomSourceAdapter(rand) : new RandomSourceAdapter(RandomUtils.Create()));
+        _rand = rand ?? (_randomSource as Random ?? new RandomFromRandomSource(_randomSource));
         _cancelLock = new object();
 
         // This fork shares some stuff with the master.
@@ -419,7 +437,8 @@ public IHost Register(string name, int? seed = null, bool? verbose = null)
         {
             _children.RemoveAll(r => r.TryGetTarget(out IHost _) == false);
             Random rand = (seed.HasValue) ? RandomUtils.Create(seed.Value) : RandomUtils.Create(_rand);
-            host = RegisterCore(this, name, Master?.FullName, rand, verbose ?? Verbose);
+            IRandomSource randomSource = new RandomSourceAdapter(rand);
+            host = RegisterCore(this, name, Master?.FullName, rand, randomSource, verbose ?? Verbose);
 
             // Need to manually copy over the parameters
             //((IHostEnvironmentInternal)host).Seed = this.Seed;
@@ -433,7 +452,7 @@ public IHost Register(string name, int? seed = null, bool? verbose = null)
     }
 
     protected abstract IHost RegisterCore(HostEnvironmentBase<TEnv> source, string shortName,
-        string parentFullName, Random rand, bool verbose);
+        string parentFullName, Random rand, IRandomSource randomSource, bool verbose);
 
     public IProgressChannel StartProgressChannel(string name)
     {
@@ -659,3 +678,8 @@ public bool RemoveOption(string name)
         return Options.Remove(name);
     }
 }
+
+
+
+
+

src/Microsoft.ML.Core/Utilities/IRandomBulkSource.cs

@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.ML.Internal.Utilities
+{
+    /// <summary>
+    /// Optional extension for RNG engines that can produce bulk sequences efficiently.
+    /// </summary>
+    internal interface IRandomBulkSource
+    {
+        /// <summary>Fills <paramref name="destination"/> with independent U[0,1) doubles.</summary>
+        void NextDoubles(Span<double> destination);
+
+        /// <summary>Fills <paramref name="destination"/> with independent uint values covering the full 32-bit range.</summary>
+        void NextUInt32(Span<uint> destination);
+    }
+}
+

src/Microsoft.ML.Core/Utilities/IRandomSource.cs

@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.ML
+{
+    /// <summary>
+    /// Abstraction for RNG engines that expose the standard <see cref="Random"/> surface.
+    /// </summary>
+    public interface IRandomSource
+    {
+        int Next();
+        int Next(int maxValue);
+        int Next(int minValue, int maxValue);
+
+        long NextInt64();
+        long NextInt64(long maxValue);
+        long NextInt64(long minValue, long maxValue);
+
+        double NextDouble();
+        float NextSingle();
+
+        void NextBytes(Span<byte> buffer);
+    }
+}
+