Remove Extra Code Comments and unused InternalStreams project#514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ivanidzo4ka merged 6 commits into from
Jul 13, 2018
Merged

Remove Extra Code Comments and unused InternalStreams project #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8886bd8
First attempt at removing extra code comments
Jul 10, 2018
b635e93
Round #2
Jul 10, 2018
97290b2
Removing Microsoft.ML.InternalStreams per comment on #513
Jul 11, 2018
1b1e5bb
Address notes from @Ivanidzo4ka
Jul 12, 2018
7bcd0a6
Remove TreeOrderedCandidatesSearch
Jul 12, 2018
d41d116
Remove whitespace and reinstate commented out tests
Jul 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Microsoft.ML.sln
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}"

@TomFinleyTomFinleyJul 12, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎆 🍾 😆 Good riddance!!

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Predictor.Tests", "test\Microsoft.ML.Predictor.Tests\Microsoft.ML.Predictor.Tests.csproj", "{6B047E09-39C9-4583-96F3-685D84CA4117}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ResultProcessor", "src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj", "{3769FCC3-9AFF-4C37-97E9-6854324681DF}"
Expand DownExpand Up@@ -150,10 +148,6 @@ Global
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.Build.0 = Release|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.Build.0 = Release|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B047E09-39C9-4583-96F3-685D84CA4117}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand DownExpand Up@@ -218,7 +212,6 @@ Global
{2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
{64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
{B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
{6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
{3769FCC3-9AFF-4C37-97E9-6854324681DF} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
{B7B593C5-FB8C-4ADA-A638-5B53B47D087E} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.ML.Console/Microsoft.ML.Console.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
<ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
<ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
<ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
<ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
<ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
<ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
<ProjectReference Include="..\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
Expand Down
6 changes: 0 additions & 6 deletions src/Microsoft.ML.Core/Utilities/DoubleParser.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,12 +433,6 @@ public static bool TryParse(out Double value, string s, int ichMin, int ichLim,
if (FloatUtils.GetBits(x) != 0 || FloatUtils.GetBits(value) != TopBit || !neg)
{
System.Diagnostics.Debug.WriteLine("*** FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value));
//if (!_failed)
//{
// // REVIEW: Double.Parse gets several things wrong, like mapping 148e-325 to 0x2 instead of 0x3.
// _failed = true;
// Contracts.Assert(false, string.Format("FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value)));
//}
}
}
#endif
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.ML.Core/Utilities/MathUtils.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,10 +258,6 @@ public static Float SoftMax(Float[] inputs, int count)
if (count == 1)
return max;

//else if (leng == 2) {
// return SoftMax(inputs[0], inputs[1]);
//}

double intermediate = 0.0;
Float cutoff = max - LogTolerance;

Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderParser.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,9 +137,9 @@ private sealed class ParseStats
private volatile int _cref;

// Total number of rows, number of unparsable values, number of format errors.
private /*volatile*/ long _rowCount;
private /*volatile*/ long _badCount;
private /*volatile*/ long _fmtCount;
private long _rowCount;
private long _badCount;
private long _fmtCount;

public ParseStats(IChannelProvider provider, int cref, long maxShow = MaxShow)
{
Expand Down
9 changes: 0 additions & 9 deletions src/Microsoft.ML.FastTree/Application/LogLossApplication.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,15 +107,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

_gradient[d1] += delta;
_gradient[d2] -= delta;
/*
double labelDiff = (labels[d1] - labels[d2]);
double margin = labelDiff * (_scores[d1] - _scores[d2]);
if (_coef - margin > 0)
{
_gradient[d1] += 0.01 * labelDiff;
_gradient[d2] -= 0.01 * labelDiff;
}
*/
}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.ML.FastTree/Application/WinLossSurplusApplication.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

double inverseMaxDCG = _inverseMaxDCGT[query];

//int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
int[] permutation = _permutationBuffers[threadIndex];

short[] labels = Labels;
Expand Down
30 changes: 1 addition & 29 deletions src/Microsoft.ML.FastTree/Dataset/FeatureFlock.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -698,20 +698,6 @@ public void FillSplitCandidatesCategoricalLowPopulation(LeastSquaresRegressionTr
var binStats = virtualBins[i];
catFeatureCount += 1 + binStats.SubFeatures.Length;

/*int feature = features[i];
int subfeature = feature - featureMin;
Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
Contracts.Assert(subfeature <= feature);
Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
Contracts.Assert(featureUseCount[feature] >= 0);
Contracts.Assert(Flock.BinCount(subfeature) == 2);
Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

var binStats = GetBinStats(GetMinBorder(subfeature));
sumGTTargets += binStats.SumTargets;
if (hasWeights)
sumGTWeights += binStats.SumWeights;*/

sumGTTargets += binStats.SumTargets;
gtCount += binStats.Count;
docsInCurrentGroup += binStats.Count;
Expand DownExpand Up@@ -933,21 +919,7 @@ public void FillSplitCandidatesCategoricalNeighborBundling(LeastSquaresRegressio
{
var binStats = virtualBins[i];
catFeatureCount += 1 + binStats.SubFeatures.Length;

/*int feature = features[i];
int subfeature = feature - featureMin;
Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
Contracts.Assert(subfeature <= feature);
Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
Contracts.Assert(featureUseCount[feature] >= 0);
Contracts.Assert(Flock.BinCount(subfeature) == 2);
Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

var binStats = GetBinStats(GetMinBorder(subfeature));
sumGTTargets += binStats.SumTargets;
if (hasWeights)
sumGTWeights += binStats.SumWeights;*/


sumGTTargets += binStats.SumTargets;
gtCount += binStats.Count;
docsInCurrentGroup += binStats.Count;
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.ML.FastTree/Dataset/SegmentIntArray.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -168,11 +168,8 @@ public static void StatsOfBestEncoding(uint[] ivalues, int bitsForMaxItem, bool

max = 0;
bits = TransitionCost;
//IEnumerator<int> ienum = ivalues.GetEnumerator();
//while (ienum.MoveNext())
for (int i = 0; i < ivalues.Length; ++i)
{
//uint val = (uint)ienum.Current;
uint val = (uint)ivalues[i];
if (val > max)
max = val;
Expand Down
5 changes: 0 additions & 5 deletions src/Microsoft.ML.FastTree/Dataset/SparseIntArray.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -546,13 +546,9 @@ public unsafe int this[int virtualIndex]
{
get
{
//if (virtualIndex < _index) throw new Exception("Index must move forward");

if (virtualIndex < _nextIndex)
return 0;

//if (virtualIndex >= _array._length) throw new IndexOutOfRangeException();

if (virtualIndex == _nextIndex)
return _array._values[_pos];

Expand All@@ -561,7 +557,6 @@ public unsafe int this[int virtualIndex]
{
while (_pos < _array._values.Length)
{
//_index = _nextIndex;
_nextIndex += pDeltas[_pos];
if (virtualIndex < _nextIndex)
return 0;
Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.ML.FastTree/FastTreeRanking.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -579,7 +579,6 @@ private void SetupSecondaryGains(Arguments args)
_secondaryMetricShare = 0.0;
return;
}
//for (int i = 0; i < _secondaryGains.Length; ++i) _secondaryGains[i] *= cmd.secondaryMetricShare;
_secondaryInverseMaxDCGT = DCGCalculator.MaxDCG(_secondaryGains, Dataset.Boundaries,
new int[] { args.lambdaMartMaxTruncation })[0].Select(d => 1.0 / d).ToArray();
}
Expand DownExpand Up@@ -726,7 +725,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)
double inverseMaxDcg = _inverseMaxDcgt[query];
double secondaryInverseMaxDcg = _secondaryMetricShare == 0 ? 0.0 : _secondaryInverseMaxDcgt[query];

//int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
int[] permutation = _permutationBuffers[threadIndex];

short[] labels = _labels;
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
<ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
<ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
<ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
<ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.FastTree/Training/ScoreTracker.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public void Initialize(ScoreTracker scores1, RegressionTree tree, DocumentPartit
}

//InitScores -initScores can be null in such case the scores are reinitialized to Zero
private void InitializeScores(double[] initScores /* = null */)
private void InitializeScores(double[] initScores)
{
if (initScores == null)
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove Extra Code Comments and unused InternalStreams project#514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Ivanidzo4ka
merged 6 commits into

from

Jul 13, 2018
 Merged


Remove Extra Code Comments and unused InternalStreams project
#514
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8886bd8

First attempt at removing extra code comments

Jul 10, 2018
b635e93

Round #2

Jul 10, 2018
97290b2

Removing Microsoft.ML.InternalStreams per comment on #513

Jul 11, 2018
1b1e5bb

Address notes from @Ivanidzo4ka

Jul 12, 2018
7bcd0a6

Remove TreeOrderedCandidatesSearch

Jul 12, 2018
d41d116

Remove whitespace and reinstate commented out tests

Jul 13, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 0 additions & 7 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}"
@TomFinleyTomFinleyJul 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎆 🍾 😆 Good riddance!!
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Predictor.Tests", "test\Microsoft.ML.Predictor.Tests\Microsoft.ML.Predictor.Tests.csproj", "{6B047E09-39C9-4583-96F3-685D84CA4117}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ResultProcessor", "src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj", "{3769FCC3-9AFF-4C37-97E9-6854324681DF}"
Expand DownExpand Up@@ -150,10 +148,6 @@ Global
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.Build.0 = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.Build.0 = Release|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand DownExpand Up@@ -218,7 +212,6 @@ Global
 {2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {3769FCC3-9AFF-4C37-97E9-6854324681DF} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {B7B593C5-FB8C-4ADA-A638-5B53B47D087E} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
Expand Down

6 changes: 0 additions & 6 deletions
src/Microsoft.ML.Core/Utilities/DoubleParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,12 +433,6 @@ public static bool TryParse(out Double value, string s, int ichMin, int ichLim,
 if (FloatUtils.GetBits(x) != 0 || FloatUtils.GetBits(value) != TopBit || !neg)
 {
 System.Diagnostics.Debug.WriteLine("*** FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value));
 //if (!_failed)
 //{
 // // REVIEW: Double.Parse gets several things wrong, like mapping 148e-325 to 0x2 instead of 0x3.
 // _failed = true;
 // Contracts.Assert(false, string.Format("FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value)));
 //}
 }
 }
#endif
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.ML.Core/Utilities/MathUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,10 +258,6 @@ public static Float SoftMax(Float[] inputs, int count)
 if (count == 1)
 return max;

 //else if (leng == 2) {
 // return SoftMax(inputs[0], inputs[1]);
 //}

 double intermediate = 0.0;
 Float cutoff = max - LogTolerance;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,9 +137,9 @@ private sealed class ParseStats
 private volatile int _cref;

 // Total number of rows, number of unparsable values, number of format errors.
 private /*volatile*/ long _rowCount;
 private /*volatile*/ long _badCount;
 private /*volatile*/ long _fmtCount;
 private long _rowCount;
 private long _badCount;
 private long _fmtCount;

 public ParseStats(IChannelProvider provider, int cref, long maxShow = MaxShow)
 {
Expand Down

9 changes: 0 additions & 9 deletions
src/Microsoft.ML.FastTree/Application/LogLossApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,15 +107,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 _gradient[d1] += delta;
 _gradient[d2] -= delta;
 /*
 double labelDiff = (labels[d1] - labels[d2]);
 double margin = labelDiff * (_scores[d1] - _scores[d2]);
 if (_coef - margin > 0)
 {
 _gradient[d1] += 0.01 * labelDiff;
 _gradient[d2] -= 0.01 * labelDiff;
 }
 */
 }
 }
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Application/WinLossSurplusApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 double inverseMaxDCG = _inverseMaxDCGT[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = Labels;
Expand Down

30 changes: 1 addition & 29 deletions
src/Microsoft.ML.FastTree/Dataset/FeatureFlock.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -698,20 +698,6 @@ public void FillSplitCandidatesCategoricalLowPopulation(LeastSquaresRegressionTr
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/

 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand DownExpand Up@@ -933,21 +919,7 @@ public void FillSplitCandidatesCategoricalNeighborBundling(LeastSquaresRegressio
 {
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/


 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand Down

3 changes: 0 additions & 3 deletions
src/Microsoft.ML.FastTree/Dataset/SegmentIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,11 +168,8 @@ public static void StatsOfBestEncoding(uint[] ivalues, int bitsForMaxItem, bool

 max = 0;
 bits = TransitionCost;
 //IEnumerator<int> ienum = ivalues.GetEnumerator();
 //while (ienum.MoveNext())
 for (int i = 0; i < ivalues.Length; ++i)
 {
 //uint val = (uint)ienum.Current;
 uint val = (uint)ivalues[i];
 if (val > max)
 max = val;
Expand Down

5 changes: 0 additions & 5 deletions
src/Microsoft.ML.FastTree/Dataset/SparseIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -546,13 +546,9 @@ public unsafe int this[int virtualIndex]
 {
 get
 {
 //if (virtualIndex < _index) throw new Exception("Index must move forward");

 if (virtualIndex < _nextIndex)
 return 0;

 //if (virtualIndex >= _array._length) throw new IndexOutOfRangeException();

 if (virtualIndex == _nextIndex)
 return _array._values[_pos];

Expand All@@ -561,7 +557,6 @@ public unsafe int this[int virtualIndex]
 {
 while (_pos < _array._values.Length)
 {
 //_index = _nextIndex;
 _nextIndex += pDeltas[_pos];
 if (virtualIndex < _nextIndex)
 return 0;
Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.FastTree/FastTreeRanking.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,7 +579,6 @@ private void SetupSecondaryGains(Arguments args)
 _secondaryMetricShare = 0.0;
 return;
 }
 //for (int i = 0; i < _secondaryGains.Length; ++i) _secondaryGains[i] *= cmd.secondaryMetricShare;
 _secondaryInverseMaxDCGT = DCGCalculator.MaxDCG(_secondaryGains, Dataset.Boundaries,
 new int[] { args.lambdaMartMaxTruncation })[0].Select(d => 1.0 / d).ToArray();
 }
Expand DownExpand Up@@ -726,7 +725,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)
 double inverseMaxDcg = _inverseMaxDcgt[query];
 double secondaryInverseMaxDcg = _secondaryMetricShare == 0 ? 0.0 : _secondaryInverseMaxDcgt[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = _labels;
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
 <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 </ItemGroup>

<ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.FastTree/Training/ScoreTracker.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public void Initialize(ScoreTracker scores1, RegressionTree tree, DocumentPartit
 }

 //InitScores -initScores can be null in such case the scores are reinitialized to Zero
 private void InitializeScores(double[] initScores /* = null */)
 private void InitializeScores(double[] initScores)
 {
 if (initScores == null)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove Extra Code Comments and unused InternalStreams project#514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Ivanidzo4ka
merged 6 commits into

from

Jul 13, 2018
 Merged


Remove Extra Code Comments and unused InternalStreams project
#514
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8886bd8

First attempt at removing extra code comments

Jul 10, 2018
b635e93

Round #2

Jul 10, 2018
97290b2

Removing Microsoft.ML.InternalStreams per comment on #513

Jul 11, 2018
1b1e5bb

Address notes from @Ivanidzo4ka

Jul 12, 2018
7bcd0a6

Remove TreeOrderedCandidatesSearch

Jul 12, 2018
d41d116

Remove whitespace and reinstate commented out tests

Jul 13, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 0 additions & 7 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}"
@TomFinleyTomFinleyJul 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎆 🍾 😆 Good riddance!!
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Predictor.Tests", "test\Microsoft.ML.Predictor.Tests\Microsoft.ML.Predictor.Tests.csproj", "{6B047E09-39C9-4583-96F3-685D84CA4117}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ResultProcessor", "src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj", "{3769FCC3-9AFF-4C37-97E9-6854324681DF}"
Expand DownExpand Up@@ -150,10 +148,6 @@ Global
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.Build.0 = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.Build.0 = Release|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand DownExpand Up@@ -218,7 +212,6 @@ Global
 {2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {3769FCC3-9AFF-4C37-97E9-6854324681DF} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {B7B593C5-FB8C-4ADA-A638-5B53B47D087E} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
Expand Down

6 changes: 0 additions & 6 deletions
src/Microsoft.ML.Core/Utilities/DoubleParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,12 +433,6 @@ public static bool TryParse(out Double value, string s, int ichMin, int ichLim,
 if (FloatUtils.GetBits(x) != 0 || FloatUtils.GetBits(value) != TopBit || !neg)
 {
 System.Diagnostics.Debug.WriteLine("*** FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value));
 //if (!_failed)
 //{
 // // REVIEW: Double.Parse gets several things wrong, like mapping 148e-325 to 0x2 instead of 0x3.
 // _failed = true;
 // Contracts.Assert(false, string.Format("FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value)));
 //}
 }
 }
#endif
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.ML.Core/Utilities/MathUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,10 +258,6 @@ public static Float SoftMax(Float[] inputs, int count)
 if (count == 1)
 return max;

 //else if (leng == 2) {
 // return SoftMax(inputs[0], inputs[1]);
 //}

 double intermediate = 0.0;
 Float cutoff = max - LogTolerance;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,9 +137,9 @@ private sealed class ParseStats
 private volatile int _cref;

 // Total number of rows, number of unparsable values, number of format errors.
 private /*volatile*/ long _rowCount;
 private /*volatile*/ long _badCount;
 private /*volatile*/ long _fmtCount;
 private long _rowCount;
 private long _badCount;
 private long _fmtCount;

 public ParseStats(IChannelProvider provider, int cref, long maxShow = MaxShow)
 {
Expand Down

9 changes: 0 additions & 9 deletions
src/Microsoft.ML.FastTree/Application/LogLossApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,15 +107,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 _gradient[d1] += delta;
 _gradient[d2] -= delta;
 /*
 double labelDiff = (labels[d1] - labels[d2]);
 double margin = labelDiff * (_scores[d1] - _scores[d2]);
 if (_coef - margin > 0)
 {
 _gradient[d1] += 0.01 * labelDiff;
 _gradient[d2] -= 0.01 * labelDiff;
 }
 */
 }
 }
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Application/WinLossSurplusApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 double inverseMaxDCG = _inverseMaxDCGT[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = Labels;
Expand Down

30 changes: 1 addition & 29 deletions
src/Microsoft.ML.FastTree/Dataset/FeatureFlock.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -698,20 +698,6 @@ public void FillSplitCandidatesCategoricalLowPopulation(LeastSquaresRegressionTr
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/

 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand DownExpand Up@@ -933,21 +919,7 @@ public void FillSplitCandidatesCategoricalNeighborBundling(LeastSquaresRegressio
 {
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/


 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand Down

3 changes: 0 additions & 3 deletions
src/Microsoft.ML.FastTree/Dataset/SegmentIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,11 +168,8 @@ public static void StatsOfBestEncoding(uint[] ivalues, int bitsForMaxItem, bool

 max = 0;
 bits = TransitionCost;
 //IEnumerator<int> ienum = ivalues.GetEnumerator();
 //while (ienum.MoveNext())
 for (int i = 0; i < ivalues.Length; ++i)
 {
 //uint val = (uint)ienum.Current;
 uint val = (uint)ivalues[i];
 if (val > max)
 max = val;
Expand Down

5 changes: 0 additions & 5 deletions
src/Microsoft.ML.FastTree/Dataset/SparseIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -546,13 +546,9 @@ public unsafe int this[int virtualIndex]
 {
 get
 {
 //if (virtualIndex < _index) throw new Exception("Index must move forward");

 if (virtualIndex < _nextIndex)
 return 0;

 //if (virtualIndex >= _array._length) throw new IndexOutOfRangeException();

 if (virtualIndex == _nextIndex)
 return _array._values[_pos];

Expand All@@ -561,7 +557,6 @@ public unsafe int this[int virtualIndex]
 {
 while (_pos < _array._values.Length)
 {
 //_index = _nextIndex;
 _nextIndex += pDeltas[_pos];
 if (virtualIndex < _nextIndex)
 return 0;
Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.FastTree/FastTreeRanking.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,7 +579,6 @@ private void SetupSecondaryGains(Arguments args)
 _secondaryMetricShare = 0.0;
 return;
 }
 //for (int i = 0; i < _secondaryGains.Length; ++i) _secondaryGains[i] *= cmd.secondaryMetricShare;
 _secondaryInverseMaxDCGT = DCGCalculator.MaxDCG(_secondaryGains, Dataset.Boundaries,
 new int[] { args.lambdaMartMaxTruncation })[0].Select(d => 1.0 / d).ToArray();
 }
Expand DownExpand Up@@ -726,7 +725,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)
 double inverseMaxDcg = _inverseMaxDcgt[query];
 double secondaryInverseMaxDcg = _secondaryMetricShare == 0 ? 0.0 : _secondaryInverseMaxDcgt[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = _labels;
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
 <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 </ItemGroup>

<ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.FastTree/Training/ScoreTracker.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public void Initialize(ScoreTracker scores1, RegressionTree tree, DocumentPartit
 }

 //InitScores -initScores can be null in such case the scores are reinitialized to Zero
 private void InitializeScores(double[] initScores /* = null */)
 private void InitializeScores(double[] initScores)
 {
 if (initScores == null)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove Extra Code Comments and unused InternalStreams project#514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Ivanidzo4ka
merged 6 commits into

from

Jul 13, 2018
 Merged


Remove Extra Code Comments and unused InternalStreams project
#514
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8886bd8

First attempt at removing extra code comments

Jul 10, 2018
b635e93

Round #2

Jul 10, 2018
97290b2

Removing Microsoft.ML.InternalStreams per comment on #513

Jul 11, 2018
1b1e5bb

Address notes from @Ivanidzo4ka

Jul 12, 2018
7bcd0a6

Remove TreeOrderedCandidatesSearch

Jul 12, 2018
d41d116

Remove whitespace and reinstate commented out tests

Jul 13, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 0 additions & 7 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}"
@TomFinleyTomFinleyJul 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎆 🍾 😆 Good riddance!!
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Predictor.Tests", "test\Microsoft.ML.Predictor.Tests\Microsoft.ML.Predictor.Tests.csproj", "{6B047E09-39C9-4583-96F3-685D84CA4117}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ResultProcessor", "src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj", "{3769FCC3-9AFF-4C37-97E9-6854324681DF}"
Expand DownExpand Up@@ -150,10 +148,6 @@ Global
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.Build.0 = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.Build.0 = Release|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand DownExpand Up@@ -218,7 +212,6 @@ Global
 {2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {3769FCC3-9AFF-4C37-97E9-6854324681DF} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {B7B593C5-FB8C-4ADA-A638-5B53B47D087E} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
Expand Down

6 changes: 0 additions & 6 deletions
src/Microsoft.ML.Core/Utilities/DoubleParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,12 +433,6 @@ public static bool TryParse(out Double value, string s, int ichMin, int ichLim,
 if (FloatUtils.GetBits(x) != 0 || FloatUtils.GetBits(value) != TopBit || !neg)
 {
 System.Diagnostics.Debug.WriteLine("*** FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value));
 //if (!_failed)
 //{
 // // REVIEW: Double.Parse gets several things wrong, like mapping 148e-325 to 0x2 instead of 0x3.
 // _failed = true;
 // Contracts.Assert(false, string.Format("FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value)));
 //}
 }
 }
#endif
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.ML.Core/Utilities/MathUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,10 +258,6 @@ public static Float SoftMax(Float[] inputs, int count)
 if (count == 1)
 return max;

 //else if (leng == 2) {
 // return SoftMax(inputs[0], inputs[1]);
 //}

 double intermediate = 0.0;
 Float cutoff = max - LogTolerance;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,9 +137,9 @@ private sealed class ParseStats
 private volatile int _cref;

 // Total number of rows, number of unparsable values, number of format errors.
 private /*volatile*/ long _rowCount;
 private /*volatile*/ long _badCount;
 private /*volatile*/ long _fmtCount;
 private long _rowCount;
 private long _badCount;
 private long _fmtCount;

 public ParseStats(IChannelProvider provider, int cref, long maxShow = MaxShow)
 {
Expand Down

9 changes: 0 additions & 9 deletions
src/Microsoft.ML.FastTree/Application/LogLossApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,15 +107,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 _gradient[d1] += delta;
 _gradient[d2] -= delta;
 /*
 double labelDiff = (labels[d1] - labels[d2]);
 double margin = labelDiff * (_scores[d1] - _scores[d2]);
 if (_coef - margin > 0)
 {
 _gradient[d1] += 0.01 * labelDiff;
 _gradient[d2] -= 0.01 * labelDiff;
 }
 */
 }
 }
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Application/WinLossSurplusApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 double inverseMaxDCG = _inverseMaxDCGT[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = Labels;
Expand Down

30 changes: 1 addition & 29 deletions
src/Microsoft.ML.FastTree/Dataset/FeatureFlock.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -698,20 +698,6 @@ public void FillSplitCandidatesCategoricalLowPopulation(LeastSquaresRegressionTr
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/

 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand DownExpand Up@@ -933,21 +919,7 @@ public void FillSplitCandidatesCategoricalNeighborBundling(LeastSquaresRegressio
 {
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/


 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand Down

3 changes: 0 additions & 3 deletions
src/Microsoft.ML.FastTree/Dataset/SegmentIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,11 +168,8 @@ public static void StatsOfBestEncoding(uint[] ivalues, int bitsForMaxItem, bool

 max = 0;
 bits = TransitionCost;
 //IEnumerator<int> ienum = ivalues.GetEnumerator();
 //while (ienum.MoveNext())
 for (int i = 0; i < ivalues.Length; ++i)
 {
 //uint val = (uint)ienum.Current;
 uint val = (uint)ivalues[i];
 if (val > max)
 max = val;
Expand Down

5 changes: 0 additions & 5 deletions
src/Microsoft.ML.FastTree/Dataset/SparseIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -546,13 +546,9 @@ public unsafe int this[int virtualIndex]
 {
 get
 {
 //if (virtualIndex < _index) throw new Exception("Index must move forward");

 if (virtualIndex < _nextIndex)
 return 0;

 //if (virtualIndex >= _array._length) throw new IndexOutOfRangeException();

 if (virtualIndex == _nextIndex)
 return _array._values[_pos];

Expand All@@ -561,7 +557,6 @@ public unsafe int this[int virtualIndex]
 {
 while (_pos < _array._values.Length)
 {
 //_index = _nextIndex;
 _nextIndex += pDeltas[_pos];
 if (virtualIndex < _nextIndex)
 return 0;
Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.FastTree/FastTreeRanking.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,7 +579,6 @@ private void SetupSecondaryGains(Arguments args)
 _secondaryMetricShare = 0.0;
 return;
 }
 //for (int i = 0; i < _secondaryGains.Length; ++i) _secondaryGains[i] *= cmd.secondaryMetricShare;
 _secondaryInverseMaxDCGT = DCGCalculator.MaxDCG(_secondaryGains, Dataset.Boundaries,
 new int[] { args.lambdaMartMaxTruncation })[0].Select(d => 1.0 / d).ToArray();
 }
Expand DownExpand Up@@ -726,7 +725,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)
 double inverseMaxDcg = _inverseMaxDcgt[query];
 double secondaryInverseMaxDcg = _secondaryMetricShare == 0 ? 0.0 : _secondaryInverseMaxDcgt[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = _labels;
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
 <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 </ItemGroup>

<ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.FastTree/Training/ScoreTracker.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public void Initialize(ScoreTracker scores1, RegressionTree tree, DocumentPartit
 }

 //InitScores -initScores can be null in such case the scores are reinitialized to Zero
 private void InitializeScores(double[] initScores /* = null */)
 private void InitializeScores(double[] initScores)
 {
 if (initScores == null)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove Extra Code Comments and unused InternalStreams project#514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Ivanidzo4ka
merged 6 commits into

from

Jul 13, 2018
 Merged


Remove Extra Code Comments and unused InternalStreams project
#514
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8886bd8

First attempt at removing extra code comments

Jul 10, 2018
b635e93

Round #2

Jul 10, 2018
97290b2

Removing Microsoft.ML.InternalStreams per comment on #513

Jul 11, 2018
1b1e5bb

Address notes from @Ivanidzo4ka

Jul 12, 2018
7bcd0a6

Remove TreeOrderedCandidatesSearch

Jul 12, 2018
d41d116

Remove whitespace and reinstate commented out tests

Jul 13, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 0 additions & 7 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}"
@TomFinleyTomFinleyJul 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎆 🍾 😆 Good riddance!!
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Predictor.Tests", "test\Microsoft.ML.Predictor.Tests\Microsoft.ML.Predictor.Tests.csproj", "{6B047E09-39C9-4583-96F3-685D84CA4117}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ResultProcessor", "src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj", "{3769FCC3-9AFF-4C37-97E9-6854324681DF}"
Expand DownExpand Up@@ -150,10 +148,6 @@ Global
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.Build.0 = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.Build.0 = Release|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand DownExpand Up@@ -218,7 +212,6 @@ Global
 {2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {3769FCC3-9AFF-4C37-97E9-6854324681DF} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {B7B593C5-FB8C-4ADA-A638-5B53B47D087E} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
Expand Down

6 changes: 0 additions & 6 deletions
src/Microsoft.ML.Core/Utilities/DoubleParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,12 +433,6 @@ public static bool TryParse(out Double value, string s, int ichMin, int ichLim,
 if (FloatUtils.GetBits(x) != 0 || FloatUtils.GetBits(value) != TopBit || !neg)
 {
 System.Diagnostics.Debug.WriteLine("*** FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value));
 //if (!_failed)
 //{
 // // REVIEW: Double.Parse gets several things wrong, like mapping 148e-325 to 0x2 instead of 0x3.
 // _failed = true;
 // Contracts.Assert(false, string.Format("FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value)));
 //}
 }
 }
#endif
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.ML.Core/Utilities/MathUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,10 +258,6 @@ public static Float SoftMax(Float[] inputs, int count)
 if (count == 1)
 return max;

 //else if (leng == 2) {
 // return SoftMax(inputs[0], inputs[1]);
 //}

 double intermediate = 0.0;
 Float cutoff = max - LogTolerance;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,9 +137,9 @@ private sealed class ParseStats
 private volatile int _cref;

 // Total number of rows, number of unparsable values, number of format errors.
 private /*volatile*/ long _rowCount;
 private /*volatile*/ long _badCount;
 private /*volatile*/ long _fmtCount;
 private long _rowCount;
 private long _badCount;
 private long _fmtCount;

 public ParseStats(IChannelProvider provider, int cref, long maxShow = MaxShow)
 {
Expand Down

9 changes: 0 additions & 9 deletions
src/Microsoft.ML.FastTree/Application/LogLossApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,15 +107,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 _gradient[d1] += delta;
 _gradient[d2] -= delta;
 /*
 double labelDiff = (labels[d1] - labels[d2]);
 double margin = labelDiff * (_scores[d1] - _scores[d2]);
 if (_coef - margin > 0)
 {
 _gradient[d1] += 0.01 * labelDiff;
 _gradient[d2] -= 0.01 * labelDiff;
 }
 */
 }
 }
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Application/WinLossSurplusApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 double inverseMaxDCG = _inverseMaxDCGT[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = Labels;
Expand Down

30 changes: 1 addition & 29 deletions
src/Microsoft.ML.FastTree/Dataset/FeatureFlock.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -698,20 +698,6 @@ public void FillSplitCandidatesCategoricalLowPopulation(LeastSquaresRegressionTr
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/

 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand DownExpand Up@@ -933,21 +919,7 @@ public void FillSplitCandidatesCategoricalNeighborBundling(LeastSquaresRegressio
 {
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/


 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand Down

3 changes: 0 additions & 3 deletions
src/Microsoft.ML.FastTree/Dataset/SegmentIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,11 +168,8 @@ public static void StatsOfBestEncoding(uint[] ivalues, int bitsForMaxItem, bool

 max = 0;
 bits = TransitionCost;
 //IEnumerator<int> ienum = ivalues.GetEnumerator();
 //while (ienum.MoveNext())
 for (int i = 0; i < ivalues.Length; ++i)
 {
 //uint val = (uint)ienum.Current;
 uint val = (uint)ivalues[i];
 if (val > max)
 max = val;
Expand Down

5 changes: 0 additions & 5 deletions
src/Microsoft.ML.FastTree/Dataset/SparseIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -546,13 +546,9 @@ public unsafe int this[int virtualIndex]
 {
 get
 {
 //if (virtualIndex < _index) throw new Exception("Index must move forward");

 if (virtualIndex < _nextIndex)
 return 0;

 //if (virtualIndex >= _array._length) throw new IndexOutOfRangeException();

 if (virtualIndex == _nextIndex)
 return _array._values[_pos];

Expand All@@ -561,7 +557,6 @@ public unsafe int this[int virtualIndex]
 {
 while (_pos < _array._values.Length)
 {
 //_index = _nextIndex;
 _nextIndex += pDeltas[_pos];
 if (virtualIndex < _nextIndex)
 return 0;
Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.FastTree/FastTreeRanking.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,7 +579,6 @@ private void SetupSecondaryGains(Arguments args)
 _secondaryMetricShare = 0.0;
 return;
 }
 //for (int i = 0; i < _secondaryGains.Length; ++i) _secondaryGains[i] *= cmd.secondaryMetricShare;
 _secondaryInverseMaxDCGT = DCGCalculator.MaxDCG(_secondaryGains, Dataset.Boundaries,
 new int[] { args.lambdaMartMaxTruncation })[0].Select(d => 1.0 / d).ToArray();
 }
Expand DownExpand Up@@ -726,7 +725,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)
 double inverseMaxDcg = _inverseMaxDcgt[query];
 double secondaryInverseMaxDcg = _secondaryMetricShare == 0 ? 0.0 : _secondaryInverseMaxDcgt[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = _labels;
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
 <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 </ItemGroup>

<ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.FastTree/Training/ScoreTracker.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public void Initialize(ScoreTracker scores1, RegressionTree tree, DocumentPartit
 }

 //InitScores -initScores can be null in such case the scores are reinitialized to Zero
 private void InitializeScores(double[] initScores /* = null */)
 private void InitializeScores(double[] initScores)
 {
 if (initScores == null)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove Extra Code Comments and unused InternalStreams project#514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Ivanidzo4ka
merged 6 commits into

from

Jul 13, 2018
 Merged


Remove Extra Code Comments and unused InternalStreams project
#514
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8886bd8

First attempt at removing extra code comments

Jul 10, 2018
b635e93

Round #2

Jul 10, 2018
97290b2

Removing Microsoft.ML.InternalStreams per comment on #513

Jul 11, 2018
1b1e5bb

Address notes from @Ivanidzo4ka

Jul 12, 2018
7bcd0a6

Remove TreeOrderedCandidatesSearch

Jul 12, 2018
d41d116

Remove whitespace and reinstate commented out tests

Jul 13, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 0 additions & 7 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}"
@TomFinleyTomFinleyJul 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎆 🍾 😆 Good riddance!!
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Predictor.Tests", "test\Microsoft.ML.Predictor.Tests\Microsoft.ML.Predictor.Tests.csproj", "{6B047E09-39C9-4583-96F3-685D84CA4117}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ResultProcessor", "src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj", "{3769FCC3-9AFF-4C37-97E9-6854324681DF}"
Expand DownExpand Up@@ -150,10 +148,6 @@ Global
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.Build.0 = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.Build.0 = Release|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand DownExpand Up@@ -218,7 +212,6 @@ Global
 {2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {3769FCC3-9AFF-4C37-97E9-6854324681DF} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {B7B593C5-FB8C-4ADA-A638-5B53B47D087E} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
Expand Down

6 changes: 0 additions & 6 deletions
src/Microsoft.ML.Core/Utilities/DoubleParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,12 +433,6 @@ public static bool TryParse(out Double value, string s, int ichMin, int ichLim,
 if (FloatUtils.GetBits(x) != 0 || FloatUtils.GetBits(value) != TopBit || !neg)
 {
 System.Diagnostics.Debug.WriteLine("*** FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value));
 //if (!_failed)
 //{
 // // REVIEW: Double.Parse gets several things wrong, like mapping 148e-325 to 0x2 instead of 0x3.
 // _failed = true;
 // Contracts.Assert(false, string.Format("FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value)));
 //}
 }
 }
#endif
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.ML.Core/Utilities/MathUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,10 +258,6 @@ public static Float SoftMax(Float[] inputs, int count)
 if (count == 1)
 return max;

 //else if (leng == 2) {
 // return SoftMax(inputs[0], inputs[1]);
 //}

 double intermediate = 0.0;
 Float cutoff = max - LogTolerance;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,9 +137,9 @@ private sealed class ParseStats
 private volatile int _cref;

 // Total number of rows, number of unparsable values, number of format errors.
 private /*volatile*/ long _rowCount;
 private /*volatile*/ long _badCount;
 private /*volatile*/ long _fmtCount;
 private long _rowCount;
 private long _badCount;
 private long _fmtCount;

 public ParseStats(IChannelProvider provider, int cref, long maxShow = MaxShow)
 {
Expand Down

9 changes: 0 additions & 9 deletions
src/Microsoft.ML.FastTree/Application/LogLossApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,15 +107,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 _gradient[d1] += delta;
 _gradient[d2] -= delta;
 /*
 double labelDiff = (labels[d1] - labels[d2]);
 double margin = labelDiff * (_scores[d1] - _scores[d2]);
 if (_coef - margin > 0)
 {
 _gradient[d1] += 0.01 * labelDiff;
 _gradient[d2] -= 0.01 * labelDiff;
 }
 */
 }
 }
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Application/WinLossSurplusApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 double inverseMaxDCG = _inverseMaxDCGT[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = Labels;
Expand Down

30 changes: 1 addition & 29 deletions
src/Microsoft.ML.FastTree/Dataset/FeatureFlock.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -698,20 +698,6 @@ public void FillSplitCandidatesCategoricalLowPopulation(LeastSquaresRegressionTr
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/

 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand DownExpand Up@@ -933,21 +919,7 @@ public void FillSplitCandidatesCategoricalNeighborBundling(LeastSquaresRegressio
 {
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/


 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand Down

3 changes: 0 additions & 3 deletions
src/Microsoft.ML.FastTree/Dataset/SegmentIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,11 +168,8 @@ public static void StatsOfBestEncoding(uint[] ivalues, int bitsForMaxItem, bool

 max = 0;
 bits = TransitionCost;
 //IEnumerator<int> ienum = ivalues.GetEnumerator();
 //while (ienum.MoveNext())
 for (int i = 0; i < ivalues.Length; ++i)
 {
 //uint val = (uint)ienum.Current;
 uint val = (uint)ivalues[i];
 if (val > max)
 max = val;
Expand Down

5 changes: 0 additions & 5 deletions
src/Microsoft.ML.FastTree/Dataset/SparseIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -546,13 +546,9 @@ public unsafe int this[int virtualIndex]
 {
 get
 {
 //if (virtualIndex < _index) throw new Exception("Index must move forward");

 if (virtualIndex < _nextIndex)
 return 0;

 //if (virtualIndex >= _array._length) throw new IndexOutOfRangeException();

 if (virtualIndex == _nextIndex)
 return _array._values[_pos];

Expand All@@ -561,7 +557,6 @@ public unsafe int this[int virtualIndex]
 {
 while (_pos < _array._values.Length)
 {
 //_index = _nextIndex;
 _nextIndex += pDeltas[_pos];
 if (virtualIndex < _nextIndex)
 return 0;
Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.FastTree/FastTreeRanking.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,7 +579,6 @@ private void SetupSecondaryGains(Arguments args)
 _secondaryMetricShare = 0.0;
 return;
 }
 //for (int i = 0; i < _secondaryGains.Length; ++i) _secondaryGains[i] *= cmd.secondaryMetricShare;
 _secondaryInverseMaxDCGT = DCGCalculator.MaxDCG(_secondaryGains, Dataset.Boundaries,
 new int[] { args.lambdaMartMaxTruncation })[0].Select(d => 1.0 / d).ToArray();
 }
Expand DownExpand Up@@ -726,7 +725,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)
 double inverseMaxDcg = _inverseMaxDcgt[query];
 double secondaryInverseMaxDcg = _secondaryMetricShare == 0 ? 0.0 : _secondaryInverseMaxDcgt[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = _labels;
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
 <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 </ItemGroup>

<ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.FastTree/Training/ScoreTracker.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public void Initialize(ScoreTracker scores1, RegressionTree tree, DocumentPartit
 }

 //InitScores -initScores can be null in such case the scores are reinitialized to Zero
 private void InitializeScores(double[] initScores /* = null */)
 private void InitializeScores(double[] initScores)
 {
 if (initScores == null)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove Extra Code Comments and unused InternalStreams project#514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Ivanidzo4ka
merged 6 commits into

from

Jul 13, 2018
 Merged


Remove Extra Code Comments and unused InternalStreams project
#514
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8886bd8

First attempt at removing extra code comments

Jul 10, 2018
b635e93

Round #2

Jul 10, 2018
97290b2

Removing Microsoft.ML.InternalStreams per comment on #513

Jul 11, 2018
1b1e5bb

Address notes from @Ivanidzo4ka

Jul 12, 2018
7bcd0a6

Remove TreeOrderedCandidatesSearch

Jul 12, 2018
d41d116

Remove whitespace and reinstate commented out tests

Jul 13, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 0 additions & 7 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}"
@TomFinleyTomFinleyJul 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎆 🍾 😆 Good riddance!!
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Predictor.Tests", "test\Microsoft.ML.Predictor.Tests\Microsoft.ML.Predictor.Tests.csproj", "{6B047E09-39C9-4583-96F3-685D84CA4117}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ResultProcessor", "src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj", "{3769FCC3-9AFF-4C37-97E9-6854324681DF}"
Expand DownExpand Up@@ -150,10 +148,6 @@ Global
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.Build.0 = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.Build.0 = Release|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand DownExpand Up@@ -218,7 +212,6 @@ Global
 {2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {3769FCC3-9AFF-4C37-97E9-6854324681DF} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {B7B593C5-FB8C-4ADA-A638-5B53B47D087E} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
Expand Down

6 changes: 0 additions & 6 deletions
src/Microsoft.ML.Core/Utilities/DoubleParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,12 +433,6 @@ public static bool TryParse(out Double value, string s, int ichMin, int ichLim,
 if (FloatUtils.GetBits(x) != 0 || FloatUtils.GetBits(value) != TopBit || !neg)
 {
 System.Diagnostics.Debug.WriteLine("*** FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value));
 //if (!_failed)
 //{
 // // REVIEW: Double.Parse gets several things wrong, like mapping 148e-325 to 0x2 instead of 0x3.
 // _failed = true;
 // Contracts.Assert(false, string.Format("FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value)));
 //}
 }
 }
#endif
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.ML.Core/Utilities/MathUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,10 +258,6 @@ public static Float SoftMax(Float[] inputs, int count)
 if (count == 1)
 return max;

 //else if (leng == 2) {
 // return SoftMax(inputs[0], inputs[1]);
 //}

 double intermediate = 0.0;
 Float cutoff = max - LogTolerance;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,9 +137,9 @@ private sealed class ParseStats
 private volatile int _cref;

 // Total number of rows, number of unparsable values, number of format errors.
 private /*volatile*/ long _rowCount;
 private /*volatile*/ long _badCount;
 private /*volatile*/ long _fmtCount;
 private long _rowCount;
 private long _badCount;
 private long _fmtCount;

 public ParseStats(IChannelProvider provider, int cref, long maxShow = MaxShow)
 {
Expand Down

9 changes: 0 additions & 9 deletions
src/Microsoft.ML.FastTree/Application/LogLossApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,15 +107,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 _gradient[d1] += delta;
 _gradient[d2] -= delta;
 /*
 double labelDiff = (labels[d1] - labels[d2]);
 double margin = labelDiff * (_scores[d1] - _scores[d2]);
 if (_coef - margin > 0)
 {
 _gradient[d1] += 0.01 * labelDiff;
 _gradient[d2] -= 0.01 * labelDiff;
 }
 */
 }
 }
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Application/WinLossSurplusApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 double inverseMaxDCG = _inverseMaxDCGT[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = Labels;
Expand Down

30 changes: 1 addition & 29 deletions
src/Microsoft.ML.FastTree/Dataset/FeatureFlock.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -698,20 +698,6 @@ public void FillSplitCandidatesCategoricalLowPopulation(LeastSquaresRegressionTr
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/

 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand DownExpand Up@@ -933,21 +919,7 @@ public void FillSplitCandidatesCategoricalNeighborBundling(LeastSquaresRegressio
 {
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/


 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand Down

3 changes: 0 additions & 3 deletions
src/Microsoft.ML.FastTree/Dataset/SegmentIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,11 +168,8 @@ public static void StatsOfBestEncoding(uint[] ivalues, int bitsForMaxItem, bool

 max = 0;
 bits = TransitionCost;
 //IEnumerator<int> ienum = ivalues.GetEnumerator();
 //while (ienum.MoveNext())
 for (int i = 0; i < ivalues.Length; ++i)
 {
 //uint val = (uint)ienum.Current;
 uint val = (uint)ivalues[i];
 if (val > max)
 max = val;
Expand Down

5 changes: 0 additions & 5 deletions
src/Microsoft.ML.FastTree/Dataset/SparseIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -546,13 +546,9 @@ public unsafe int this[int virtualIndex]
 {
 get
 {
 //if (virtualIndex < _index) throw new Exception("Index must move forward");

 if (virtualIndex < _nextIndex)
 return 0;

 //if (virtualIndex >= _array._length) throw new IndexOutOfRangeException();

 if (virtualIndex == _nextIndex)
 return _array._values[_pos];

Expand All@@ -561,7 +557,6 @@ public unsafe int this[int virtualIndex]
 {
 while (_pos < _array._values.Length)
 {
 //_index = _nextIndex;
 _nextIndex += pDeltas[_pos];
 if (virtualIndex < _nextIndex)
 return 0;
Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.FastTree/FastTreeRanking.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,7 +579,6 @@ private void SetupSecondaryGains(Arguments args)
 _secondaryMetricShare = 0.0;
 return;
 }
 //for (int i = 0; i < _secondaryGains.Length; ++i) _secondaryGains[i] *= cmd.secondaryMetricShare;
 _secondaryInverseMaxDCGT = DCGCalculator.MaxDCG(_secondaryGains, Dataset.Boundaries,
 new int[] { args.lambdaMartMaxTruncation })[0].Select(d => 1.0 / d).ToArray();
 }
Expand DownExpand Up@@ -726,7 +725,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)
 double inverseMaxDcg = _inverseMaxDcgt[query];
 double secondaryInverseMaxDcg = _secondaryMetricShare == 0 ? 0.0 : _secondaryInverseMaxDcgt[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = _labels;
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
 <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 </ItemGroup>

<ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.FastTree/Training/ScoreTracker.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public void Initialize(ScoreTracker scores1, RegressionTree tree, DocumentPartit
 }

 //InitScores -initScores can be null in such case the scores are reinitialized to Zero
 private void InitializeScores(double[] initScores /* = null */)
 private void InitializeScores(double[] initScores)
 {
 if (initScores == null)
 {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove Extra Code Comments and unused InternalStreams project#514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Ivanidzo4ka
merged 6 commits into

from

Jul 13, 2018
 Merged


Remove Extra Code Comments and unused InternalStreams project
#514
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
8886bd8

First attempt at removing extra code comments

Jul 10, 2018
b635e93

Round #2

Jul 10, 2018
97290b2

Removing Microsoft.ML.InternalStreams per comment on #513

Jul 11, 2018
1b1e5bb

Address notes from @Ivanidzo4ka

Jul 12, 2018
7bcd0a6

Remove TreeOrderedCandidatesSearch

Jul 12, 2018
d41d116

Remove whitespace and reinstate commented out tests

Jul 13, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 0 additions & 7 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}"
@TomFinleyTomFinleyJul 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎆 🍾 😆 Good riddance!!
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Predictor.Tests", "test\Microsoft.ML.Predictor.Tests\Microsoft.ML.Predictor.Tests.csproj", "{6B047E09-39C9-4583-96F3-685D84CA4117}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ResultProcessor", "src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj", "{3769FCC3-9AFF-4C37-97E9-6854324681DF}"
Expand DownExpand Up@@ -150,10 +148,6 @@ Global
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2}.Release|Any CPU.Build.0 = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}.Release|Any CPU.Build.0 = Release|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {6B047E09-39C9-4583-96F3-685D84CA4117}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand DownExpand Up@@ -218,7 +212,6 @@ Global
 {2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 {3769FCC3-9AFF-4C37-97E9-6854324681DF} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 {B7B593C5-FB8C-4ADA-A638-5B53B47D087E} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
Expand Down

6 changes: 0 additions & 6 deletions
src/Microsoft.ML.Core/Utilities/DoubleParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,12 +433,6 @@ public static bool TryParse(out Double value, string s, int ichMin, int ichLim,
 if (FloatUtils.GetBits(x) != 0 || FloatUtils.GetBits(value) != TopBit || !neg)
 {
 System.Diagnostics.Debug.WriteLine("*** FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value));
 //if (!_failed)
 //{
 // // REVIEW: Double.Parse gets several things wrong, like mapping 148e-325 to 0x2 instead of 0x3.
 // _failed = true;
 // Contracts.Assert(false, string.Format("FloatParser disagrees with Double.TryParse on: {0} ({1} vs {2})", str, FloatUtils.GetBits(x), FloatUtils.GetBits(value)));
 //}
 }
 }
#endif
Expand Down

4 changes: 0 additions & 4 deletions
src/Microsoft.ML.Core/Utilities/MathUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,10 +258,6 @@ public static Float SoftMax(Float[] inputs, int count)
 if (count == 1)
 return max;

 //else if (leng == 2) {
 // return SoftMax(inputs[0], inputs[1]);
 //}

 double intermediate = 0.0;
 Float cutoff = max - LogTolerance;

Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,9 +137,9 @@ private sealed class ParseStats
 private volatile int _cref;

 // Total number of rows, number of unparsable values, number of format errors.
 private /*volatile*/ long _rowCount;
 private /*volatile*/ long _badCount;
 private /*volatile*/ long _fmtCount;
 private long _rowCount;
 private long _badCount;
 private long _fmtCount;

 public ParseStats(IChannelProvider provider, int cref, long maxShow = MaxShow)
 {
Expand Down

9 changes: 0 additions & 9 deletions
src/Microsoft.ML.FastTree/Application/LogLossApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,15 +107,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 _gradient[d1] += delta;
 _gradient[d2] -= delta;
 /*
 double labelDiff = (labels[d1] - labels[d2]);
 double margin = labelDiff * (_scores[d1] - _scores[d2]);
 if (_coef - margin > 0)
 {
 _gradient[d1] += 0.01 * labelDiff;
 _gradient[d2] -= 0.01 * labelDiff;
 }
 */
 }
 }
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Application/WinLossSurplusApplication.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)

 double inverseMaxDCG = _inverseMaxDCGT[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = Labels;
Expand Down

30 changes: 1 addition & 29 deletions
src/Microsoft.ML.FastTree/Dataset/FeatureFlock.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -698,20 +698,6 @@ public void FillSplitCandidatesCategoricalLowPopulation(LeastSquaresRegressionTr
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/

 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand DownExpand Up@@ -933,21 +919,7 @@ public void FillSplitCandidatesCategoricalNeighborBundling(LeastSquaresRegressio
 {
 var binStats = virtualBins[i];
 catFeatureCount += 1 + binStats.SubFeatures.Length;

 /*int feature = features[i];
 int subfeature = feature - featureMin;
 Contracts.Assert(0 <= subfeature && subfeature < Flock.Count);
 Contracts.Assert(subfeature <= feature);
 Contracts.Assert(learner.TrainData.FlockToFirstFeature(flock) == feature - subfeature);
 Contracts.Assert(featureUseCount[feature] >= 0);
 Contracts.Assert(Flock.BinCount(subfeature) == 2);
 Contracts.Assert(GetMaxBorder(subfeature) == GetMinBorder(subfeature));

 var binStats = GetBinStats(GetMinBorder(subfeature));
 sumGTTargets += binStats.SumTargets;
 if (hasWeights)
 sumGTWeights += binStats.SumWeights;*/


 sumGTTargets += binStats.SumTargets;
 gtCount += binStats.Count;
 docsInCurrentGroup += binStats.Count;
Expand Down

3 changes: 0 additions & 3 deletions
src/Microsoft.ML.FastTree/Dataset/SegmentIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,11 +168,8 @@ public static void StatsOfBestEncoding(uint[] ivalues, int bitsForMaxItem, bool

 max = 0;
 bits = TransitionCost;
 //IEnumerator<int> ienum = ivalues.GetEnumerator();
 //while (ienum.MoveNext())
 for (int i = 0; i < ivalues.Length; ++i)
 {
 //uint val = (uint)ienum.Current;
 uint val = (uint)ivalues[i];
 if (val > max)
 max = val;
Expand Down

5 changes: 0 additions & 5 deletions
src/Microsoft.ML.FastTree/Dataset/SparseIntArray.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -546,13 +546,9 @@ public unsafe int this[int virtualIndex]
 {
 get
 {
 //if (virtualIndex < _index) throw new Exception("Index must move forward");

 if (virtualIndex < _nextIndex)
 return 0;

 //if (virtualIndex >= _array._length) throw new IndexOutOfRangeException();

 if (virtualIndex == _nextIndex)
 return _array._values[_pos];

Expand All@@ -561,7 +557,6 @@ public unsafe int this[int virtualIndex]
 {
 while (_pos < _array._values.Length)
 {
 //_index = _nextIndex;
 _nextIndex += pDeltas[_pos];
 if (virtualIndex < _nextIndex)
 return 0;
Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.FastTree/FastTreeRanking.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -579,7 +579,6 @@ private void SetupSecondaryGains(Arguments args)
 _secondaryMetricShare = 0.0;
 return;
 }
 //for (int i = 0; i < _secondaryGains.Length; ++i) _secondaryGains[i] *= cmd.secondaryMetricShare;
 _secondaryInverseMaxDCGT = DCGCalculator.MaxDCG(_secondaryGains, Dataset.Boundaries,
 new int[] { args.lambdaMartMaxTruncation })[0].Select(d => 1.0 / d).ToArray();
 }
Expand DownExpand Up@@ -726,7 +725,6 @@ protected override void GetGradientInOneQuery(int query, int threadIndex)
 double inverseMaxDcg = _inverseMaxDcgt[query];
 double secondaryInverseMaxDcg = _secondaryMetricShare == 0 ? 0.0 : _secondaryInverseMaxDcgt[query];

 //int[] permutation = (threadIndex < 0 ? new int[numDocuments] : _permutationBuffers[threadIndex]);
 int[] permutation = _permutationBuffers[threadIndex];

 short[] labels = _labels;
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
 <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj" />
 </ItemGroup>

<ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.FastTree/Training/ScoreTracker.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@ public void Initialize(ScoreTracker scores1, RegressionTree tree, DocumentPartit
 }

 //InitScores -initScores can be null in such case the scores are reinitialized to Zero
 private void InitializeScores(double[] initScores /* = null */)
 private void InitializeScores(double[] initScores)
 {
 if (initScores == null)
 {
Expand Down
Loading