Skip to content

Commit 9ba2cd7

Browse files
ericstjericstj
authored
Fix warnings and enable warningsAsError (#6385)
* Fix warnings and enable warningsAsError * Fix usage of <inheritdoc/>
1 parent c8b3ca4 commit 9ba2cd7

File tree

12 files changed

+16
-165
lines changed

12 files changed

+16
-165
lines changed

‎build.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\build.ps1""" -restore -build -warnAsError 0 %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\build.ps1""" -restore -build %*"
33
exit /b %ErrorLevel%

‎restore.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -warnAsError 0 %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore %*"
33
exit /b %ErrorLevel%

‎restore.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
1010
done
1111
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1212

13-
"$DIR/eng/common/build.sh" --restore --warnAsError false "$@"
13+
"$DIR/eng/common/build.sh" --restore "$@"

‎src/Microsoft.Data.Analysis.Interactive/DataFrameKernelExtension.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class DataFrameKernelExtension : IKernelExtension
2020
public async Task OnLoadAsync(Kernel kernel)
2121
{
2222
RegisterDataFrame();
23-
if (Kernel.Root?.FindKernel("csharp") is { } csKernel)
23+
if (Kernel.Root?.FindKernelByName("csharp") is { } csKernel)
2424
{
2525
await LoadExtensionApiAsync(csKernel);
2626
}

‎src/Microsoft.ML.AutoML.Interactive/AutoMLMonitorKernelExtension.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public async Task OnLoadAsync(Kernel kernel)
2929
WriteTable(monitor, writer);
3030
}, "text/html");
3131

32-
if (Kernel.Root?.FindKernel("csharp") is { } csKernel)
32+
if (Kernel.Root?.FindKernelByName("csharp") is { } csKernel)
3333
{
3434
await LoadExtensionApiAsync(csKernel);
3535
}

‎src/Microsoft.ML.AutoML/API/AutoMLExperimentExtension.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,11 @@ public static AutoMLExperiment SetGridSearchTuner(this AutoMLExperiment experime
254254

255255
return tuner;
256256
});
257-
257+
258258
return experiment;
259259
}
260260

261+
/// <summary>
261262
/// Set checkpoint folder for <see cref="AutoMLExperiment"/>. The checkpoint folder will be used to save
262263
/// temporary output, run history and many other stuff which will be used for restoring training process
263264
/// from last checkpoint and continue training.

‎src/Microsoft.ML.SearchSpace/Option/ChoiceOption.cs

-8
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,13 @@ public ChoiceOption(object[] choices, object? defaultChoice)
4848
/// </summary>
4949
public Parameter[] Choices { get; }
5050

51-
/// <summary>
5251
/// <inheritdoc/>
53-
/// </summary>
5452
public override int FeatureSpaceDim => Choices.Length == 1 ? 0 : 1;
5553

56-
/// <summary>
5754
/// <inheritdoc/>
58-
/// </summary>
5955
public override int?[] Step => new int?[] { Choices.Length };
6056

61-
/// <summary>
6257
/// <inheritdoc/>
63-
/// </summary>
6458
public override double[] MappingToFeatureSpace(Parameter param)
6559
{
6660
if (FeatureSpaceDim == 0)
@@ -74,9 +68,7 @@ public override double[] MappingToFeatureSpace(Parameter param)
7468
return _option.MappingToFeatureSpace(Parameter.FromInt(x));
7569
}
7670

77-
/// <summary>
7871
/// <inheritdoc/>
79-
/// </summary>
8072
public override Parameter SampleFromFeatureSpace(double[] values)
8173
{
8274
Contract.Assert(values.Length >= 0, "values length must be greater than 0");

‎src/Microsoft.ML.SearchSpace/Option/NestOption.cs

-42
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,13 @@ public sealed class NestOption : OptionBase, IDictionary<string, OptionBase>
1717
{
1818
private readonly Dictionary<string, OptionBase> _options = new Dictionary<string, OptionBase>();
1919

20-
/// <summary>
2120
/// <inheritdoc/>
22-
/// </summary>
2321
public OptionBase this[string key] { get => ((IDictionary<string, OptionBase>)_options)[key]; set => ((IDictionary<string, OptionBase>)_options)[key] = value; }
2422

25-
/// <summary>
2623
/// <inheritdoc/>
27-
/// </summary>
2824
public override int FeatureSpaceDim => _options.Values.Select(x => x.FeatureSpaceDim).Sum();
2925

30-
/// <summary>
3126
/// <inheritdoc/>
32-
/// </summary>
3327
public override double[] Default
3428
{
3529
get
@@ -40,9 +34,7 @@ public override double[] Default
4034
}
4135
}
4236

43-
/// <summary>
4437
/// <inheritdoc/>
45-
/// </summary>
4638
public override int?[] Step
4739
{
4840
get
@@ -53,9 +45,7 @@ public override int?[] Step
5345
}
5446
}
5547

56-
/// <summary>
5748
/// <inheritdoc/>
58-
/// </summary>
5949
public override Parameter SampleFromFeatureSpace(double[] values)
6050
{
6151
var param = Parameter.CreateNestedParameter();
@@ -71,9 +61,7 @@ public override Parameter SampleFromFeatureSpace(double[] values)
7161
return param;
7262
}
7363

74-
/// <summary>
7564
/// <inheritdoc/>
76-
/// </summary>
7765
public override double[] MappingToFeatureSpace(Parameter parameter)
7866
{
7967
var res = new List<double>();
@@ -88,109 +76,79 @@ public override double[] MappingToFeatureSpace(Parameter parameter)
8876
return res.ToArray();
8977
}
9078

91-
/// <summary>
9279
/// <inheritdoc/>
93-
/// </summary>
9480
public ICollection<string> Keys => ((IDictionary<string, OptionBase>)_options).Keys;
9581

96-
/// <summary>
9782
/// <inheritdoc/>
98-
/// </summary>
9983
public ICollection<OptionBase> Values => ((IDictionary<string, OptionBase>)_options).Values;
10084

101-
/// <summary>
10285
/// <inheritdoc/>
103-
/// </summary>
10486
public int Count => ((ICollection<KeyValuePair<string, OptionBase>>)_options).Count;
10587

106-
/// <summary>
10788
/// <inheritdoc/>
108-
/// </summary>
10989
public bool IsReadOnly => ((ICollection<KeyValuePair<string, OptionBase>>)_options).IsReadOnly;
11090

111-
/// <summary>
11291
/// <inheritdoc/>
113-
/// </summary>
11492
public void Add(string key, OptionBase value)
11593
{
11694
((IDictionary<string, OptionBase>)_options).Add(key, value);
11795
}
11896

119-
/// <summary>
12097
/// <inheritdoc/>
121-
/// </summary>
12298
public void Add(KeyValuePair<string, OptionBase> item)
12399
{
124100
((ICollection<KeyValuePair<string, OptionBase>>)_options).Add(item);
125101
}
126102

127-
/// <summary>
128103
/// <inheritdoc/>
129-
/// </summary>
130104
public void Clear()
131105
{
132106
((ICollection<KeyValuePair<string, OptionBase>>)_options).Clear();
133107
}
134108

135-
/// <summary>
136109
/// <inheritdoc/>
137-
/// </summary>
138110
public bool Contains(KeyValuePair<string, OptionBase> item)
139111
{
140112
return ((ICollection<KeyValuePair<string, OptionBase>>)_options).Contains(item);
141113
}
142114

143-
/// <summary>
144115
/// <inheritdoc/>
145-
/// </summary>
146116
public bool ContainsKey(string key)
147117
{
148118
return ((IDictionary<string, OptionBase>)_options).ContainsKey(key);
149119
}
150120

151-
/// <summary>
152121
/// <inheritdoc/>
153-
/// </summary>
154122
public void CopyTo(KeyValuePair<string, OptionBase>[] array, int arrayIndex)
155123
{
156124
((ICollection<KeyValuePair<string, OptionBase>>)_options).CopyTo(array, arrayIndex);
157125
}
158126

159-
/// <summary>
160127
/// <inheritdoc/>
161-
/// </summary>
162128
public IEnumerator<KeyValuePair<string, OptionBase>> GetEnumerator()
163129
{
164130
return ((IEnumerable<KeyValuePair<string, OptionBase>>)_options).GetEnumerator();
165131
}
166132

167-
/// <summary>
168133
/// <inheritdoc/>
169-
/// </summary>
170134
public bool Remove(string key)
171135
{
172136
return ((IDictionary<string, OptionBase>)_options).Remove(key);
173137
}
174138

175-
/// <summary>
176139
/// <inheritdoc/>
177-
/// </summary>
178140
public bool Remove(KeyValuePair<string, OptionBase> item)
179141
{
180142
return ((ICollection<KeyValuePair<string, OptionBase>>)_options).Remove(item);
181143
}
182144

183-
/// <summary>
184145
/// <inheritdoc/>
185-
/// </summary>
186146
public bool TryGetValue(string key, out OptionBase value)
187147
{
188148
return ((IDictionary<string, OptionBase>)_options).TryGetValue(key, out value);
189149
}
190150

191-
/// <summary>
192151
/// <inheritdoc/>
193-
/// </summary>
194152
IEnumerator IEnumerable.GetEnumerator()
195153
{
196154
return ((IEnumerable)_options).GetEnumerator();

‎src/Microsoft.ML.SearchSpace/Option/UniformNumericOption.cs

-16
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,13 @@ public UniformNumericOption(double min, double max, bool logBase = false)
4444
/// </summary>
4545
public bool LogBase { get; }
4646

47-
/// <summary>
4847
/// <inheritdoc/>
49-
/// </summary>
5048
public override int FeatureSpaceDim => 1;
5149

52-
/// <summary>
5350
/// <inheritdoc/>
54-
/// </summary>
5551
public override int?[] Step => new int?[] { null };
5652

57-
/// <summary>
5853
/// <inheritdoc/>
59-
/// </summary>
6054
public override double[] MappingToFeatureSpace(Parameter param)
6155
{
6256
var x = param.AsType<double>();
@@ -75,9 +69,7 @@ public override double[] MappingToFeatureSpace(Parameter param)
7569
}
7670
}
7771

78-
/// <summary>
7972
/// <inheritdoc/>
80-
/// </summary>
8173
public override Parameter SampleFromFeatureSpace(double[] values)
8274
{
8375
Contract.Assert(values.Length == 1, "values length must be 1");
@@ -140,19 +132,15 @@ public UniformSingleOption(float min, float max, bool logBase = false, float? de
140132
}
141133
}
142134

143-
/// <summary>
144135
/// <inheritdoc/>
145-
/// </summary>
146136
public override double[] MappingToFeatureSpace(Parameter param)
147137
{
148138
var singleValue = param.AsType<float>();
149139
var doubleValue = Convert.ToDouble(singleValue);
150140
return base.MappingToFeatureSpace(Parameter.FromDouble(doubleValue));
151141
}
152142

153-
/// <summary>
154143
/// <inheritdoc/>
155-
/// </summary>
156144
public override Parameter SampleFromFeatureSpace(double[] values)
157145
{
158146
var doubleValue = base.SampleFromFeatureSpace(values).AsType<double>();
@@ -182,9 +170,7 @@ public UniformIntOption(int min, int max, bool logBase = false, int? defaultValu
182170
}
183171
}
184172

185-
/// <summary>
186173
/// <inheritdoc/>
187-
/// </summary>
188174
public override Parameter SampleFromFeatureSpace(double[] values)
189175
{
190176
var param = base.SampleFromFeatureSpace(values);
@@ -193,9 +179,7 @@ public override Parameter SampleFromFeatureSpace(double[] values)
193179
return Parameter.FromInt(intValue);
194180
}
195181

196-
/// <summary>
197182
/// <inheritdoc/>
198-
/// </summary>
199183
public override double[] MappingToFeatureSpace(Parameter param)
200184
{
201185
var value = param.AsType<int>();

0 commit comments

Comments
 (0)