Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions build/vsts-ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@ extends:
enabled: true
tsa:
enabled: true
settings:
networkIsolationPolicy: Permissive,CFSClean
pool:
name: $(DncEngInternalBuildPool)
image: $(WindowsImage)
Expand Down
32 changes: 19 additions & 13 deletions src/Native/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,9 @@ set(RESOURCES)
# Include 'bin/obj' dir since it contains _version.h
include_directories("$ENV{__IntermediatesDir}")

# Define path to native source link file
set(NATIVE_SOURCELINK_FILE_PATH "$ENV{__IntermediatesDir}/native.sourcelink.json")

if(WIN32)
add_definitions(-DWIN32)
add_definitions(-D_WIN32=1)
Expand All@@ -22,11 +25,9 @@ if(WIN32)
endif()
add_compile_options($<$<CONFIG:Debug>:-DDEBUG>)
add_compile_options($<$<CONFIG:Release>:-DNDEBUG>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:-DNDEBUG>)
add_compile_options($<$<CONFIG:Debug>:/Od>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) # /MT will static link the VC runtime library, so it doesn't need to be installed on the target machine
add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options(/guard:cf)
add_compile_options(/Zo) # make optimized builds debugging easier. /Zo is the newer documented flag.
add_compile_options(/nologo) # Suppress Startup Banner
Expand All@@ -41,6 +42,11 @@ if(WIN32)
add_compile_options(/Zc:inline)
add_compile_options(/fp:precise)
add_compile_options(/EHsc)
add_compile_options(/Brepro)
add_compile_options(/d1nodatetime)
add_compile_options(/experimental:deterministic)
add_compile_options(/GL)
add_compile_options(/d2CastGuardFailureMode:fastfail)

# From here below are warnings required to be explicitly enabled.
add_compile_options(/w34242)
Expand All@@ -62,27 +68,27 @@ if(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864")

set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf /Brepro")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf /Brepro")

# Enable native source link if the source link file exists
if(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
endif(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})

# Debug build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/NOVCFEATURE")
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")

# Release build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")

# RelWithDebInfo specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
list(APPEND RESOURCES $ENV{__IntermediatesDir}/NativeVersion.rc)
else()
add_compile_options(-Wno-unused-local-typedef)
Expand Down
12 changes: 11 additions & 1 deletion src/Native/Native.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<GenerateNativeVersionInfo>true</GenerateNativeVersionInfo>
<NativeVersionFile>$(IntermediateOutputPath)_version.h</NativeVersionFile>
<NativeSourceLinkFile>$(IntermediateOutputPath)native.sourcelink.json</NativeSourceLinkFile>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
Expand DownExpand Up@@ -120,7 +121,7 @@

<Target Name="BuildNativeWindows"
Condition="'$(OS)' == 'Windows_NT'"
DependsOnTargets="GenerateNativeVersionFile">
DependsOnTargets="GenerateNativeVersionFile;GenerateNativeSourcelinkFile">

<PropertyGroup>
<BuildArgs>$(Configuration) $(TargetArchitecture) --mkllibpath $(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsVersion)\runtimes\$(PackageRid)\native</BuildArgs>
Expand DownExpand Up@@ -248,6 +249,15 @@

</Target>

<Target Name="GenerateNativeSourcelinkFile"
DependsOnTargets="GenerateSourceLinkFile"
Condition="'$(DisableSourceLink)' != 'true' and '$(OS)' == 'Windows_NT'"
Inputs="$(SourceLink)"
Outputs="$(NativeSourceLinkFile)">
<Error Condition="'$(SourceLink)' == ''" Text="Please set SourceLink to forward appropriate information for sourcelink."/>
<Copy SourceFiles="$(SourceLink)" DestinationFiles="$(NativeSourceLinkFile)" />
</Target>

<Target Name="Pack" />
<Target Name="Test" />

Expand Down
16 changes: 14 additions & 2 deletions src/Native/build.cmd
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@ setlocal

:: Store current script directory before %~dp0 gets affected by another process later.
set __currentScriptDir=%~dp0
set "__currentScriptDir=%__currentScriptDir:~0,-1%"


:SetupArgs
:: Initialize the args that will be passed to cmake
set __rootDir=%__currentScriptDir%..\..
set __rootDir=%__currentScriptDir%\..\..
set __artifactsDir=%__rootDir%\artifacts
set __binDir=%__artifactsDir%\bin
set __objDir=%__artifactsDir%\obj
Expand DownExpand Up@@ -51,7 +53,9 @@ set "VSCMD_START_DIR=%__currentScriptDir%"
call "%_VSCOMNTOOLS%\VsDevCmd.bat"

:RunVCVars
if "%VisualStudioVersion%"=="17.0" (
if "%VisualStudioVersion%"=="18.0" (
goto :VS2026
) else if "%VisualStudioVersion%"=="17.0" (
goto :VS2022
) else if "%VisualStudioVersion%"=="16.0" (
goto :VS2019
Expand All@@ -67,6 +71,14 @@ echo Error: Visual Studio 2015, 2017, 2019, or 2022 required
echo Please see https://github.com/dotnet/machinelearning/tree/main/Documentation for build instructions.
exit /b 1

:VS2026
:: Setup vars for VS2026
set __PlatformToolset=v145
set __VSVersion=18 2026
:: Set the environment for the native build
call "%VS180COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch%
goto :SetupDirs

:VS2022
:: Setup vars for VS2022
set __PlatformToolset=v143
Expand Down
1 change: 1 addition & 0 deletions src/Native/gen-buildsys-win.bat
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ if /i "%3" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64)
if /i "%3" == "x86" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A Win32)
if /i "%3" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm64)
if /i "%3" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm)
echo "%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
Comment thread
ericstj marked this conversation as resolved.
"%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
endlocal
GOTO :DONE
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions build/vsts-ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@ extends:
enabled: true
tsa:
enabled: true
settings:
networkIsolationPolicy: Permissive,CFSClean
pool:
name: $(DncEngInternalBuildPool)
image: $(WindowsImage)
Expand Down
32 changes: 19 additions & 13 deletions src/Native/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,9 @@ set(RESOURCES)
# Include 'bin/obj' dir since it contains _version.h
include_directories("$ENV{__IntermediatesDir}")

# Define path to native source link file
set(NATIVE_SOURCELINK_FILE_PATH "$ENV{__IntermediatesDir}/native.sourcelink.json")

if(WIN32)
add_definitions(-DWIN32)
add_definitions(-D_WIN32=1)
Expand All@@ -22,11 +25,9 @@ if(WIN32)
endif()
add_compile_options($<$<CONFIG:Debug>:-DDEBUG>)
add_compile_options($<$<CONFIG:Release>:-DNDEBUG>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:-DNDEBUG>)
add_compile_options($<$<CONFIG:Debug>:/Od>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) # /MT will static link the VC runtime library, so it doesn't need to be installed on the target machine
add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options(/guard:cf)
add_compile_options(/Zo) # make optimized builds debugging easier. /Zo is the newer documented flag.
add_compile_options(/nologo) # Suppress Startup Banner
Expand All@@ -41,6 +42,11 @@ if(WIN32)
add_compile_options(/Zc:inline)
add_compile_options(/fp:precise)
add_compile_options(/EHsc)
add_compile_options(/Brepro)
add_compile_options(/d1nodatetime)
add_compile_options(/experimental:deterministic)
add_compile_options(/GL)
add_compile_options(/d2CastGuardFailureMode:fastfail)

# From here below are warnings required to be explicitly enabled.
add_compile_options(/w34242)
Expand All@@ -62,27 +68,27 @@ if(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864")

set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf /Brepro")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf /Brepro")

# Enable native source link if the source link file exists
if(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
endif(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})

# Debug build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/NOVCFEATURE")
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")

# Release build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")

# RelWithDebInfo specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
list(APPEND RESOURCES $ENV{__IntermediatesDir}/NativeVersion.rc)
else()
add_compile_options(-Wno-unused-local-typedef)
Expand Down
12 changes: 11 additions & 1 deletion src/Native/Native.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<GenerateNativeVersionInfo>true</GenerateNativeVersionInfo>
<NativeVersionFile>$(IntermediateOutputPath)_version.h</NativeVersionFile>
<NativeSourceLinkFile>$(IntermediateOutputPath)native.sourcelink.json</NativeSourceLinkFile>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
Expand DownExpand Up@@ -120,7 +121,7 @@

<Target Name="BuildNativeWindows"
Condition="'$(OS)' == 'Windows_NT'"
DependsOnTargets="GenerateNativeVersionFile">
DependsOnTargets="GenerateNativeVersionFile;GenerateNativeSourcelinkFile">

<PropertyGroup>
<BuildArgs>$(Configuration) $(TargetArchitecture) --mkllibpath $(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsVersion)\runtimes\$(PackageRid)\native</BuildArgs>
Expand DownExpand Up@@ -248,6 +249,15 @@

</Target>

<Target Name="GenerateNativeSourcelinkFile"
DependsOnTargets="GenerateSourceLinkFile"
Condition="'$(DisableSourceLink)' != 'true' and '$(OS)' == 'Windows_NT'"
Inputs="$(SourceLink)"
Outputs="$(NativeSourceLinkFile)">
<Error Condition="'$(SourceLink)' == ''" Text="Please set SourceLink to forward appropriate information for sourcelink."/>
<Copy SourceFiles="$(SourceLink)" DestinationFiles="$(NativeSourceLinkFile)" />
</Target>

<Target Name="Pack" />
<Target Name="Test" />

Expand Down
16 changes: 14 additions & 2 deletions src/Native/build.cmd
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@ setlocal

:: Store current script directory before %~dp0 gets affected by another process later.
set __currentScriptDir=%~dp0
set "__currentScriptDir=%__currentScriptDir:~0,-1%"


:SetupArgs
:: Initialize the args that will be passed to cmake
set __rootDir=%__currentScriptDir%..\..
set __rootDir=%__currentScriptDir%\..\..
set __artifactsDir=%__rootDir%\artifacts
set __binDir=%__artifactsDir%\bin
set __objDir=%__artifactsDir%\obj
Expand DownExpand Up@@ -51,7 +53,9 @@ set "VSCMD_START_DIR=%__currentScriptDir%"
call "%_VSCOMNTOOLS%\VsDevCmd.bat"

:RunVCVars
if "%VisualStudioVersion%"=="17.0" (
if "%VisualStudioVersion%"=="18.0" (
goto :VS2026
) else if "%VisualStudioVersion%"=="17.0" (
goto :VS2022
) else if "%VisualStudioVersion%"=="16.0" (
goto :VS2019
Expand All@@ -67,6 +71,14 @@ echo Error: Visual Studio 2015, 2017, 2019, or 2022 required
echo Please see https://github.com/dotnet/machinelearning/tree/main/Documentation for build instructions.
exit /b 1

:VS2026
:: Setup vars for VS2026
set __PlatformToolset=v145
set __VSVersion=18 2026
:: Set the environment for the native build
call "%VS180COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch%
goto :SetupDirs

:VS2022
:: Setup vars for VS2022
set __PlatformToolset=v143
Expand Down
1 change: 1 addition & 0 deletions src/Native/gen-buildsys-win.bat
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ if /i "%3" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64)
if /i "%3" == "x86" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A Win32)
if /i "%3" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm64)
if /i "%3" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm)
echo "%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
Comment thread
ericstj marked this conversation as resolved.
"%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
endlocal
GOTO :DONE
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions build/vsts-ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@ extends:
enabled: true
tsa:
enabled: true
settings:
networkIsolationPolicy: Permissive,CFSClean
pool:
name: $(DncEngInternalBuildPool)
image: $(WindowsImage)
Expand Down
32 changes: 19 additions & 13 deletions src/Native/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,9 @@ set(RESOURCES)
# Include 'bin/obj' dir since it contains _version.h
include_directories("$ENV{__IntermediatesDir}")

# Define path to native source link file
set(NATIVE_SOURCELINK_FILE_PATH "$ENV{__IntermediatesDir}/native.sourcelink.json")

if(WIN32)
add_definitions(-DWIN32)
add_definitions(-D_WIN32=1)
Expand All@@ -22,11 +25,9 @@ if(WIN32)
endif()
add_compile_options($<$<CONFIG:Debug>:-DDEBUG>)
add_compile_options($<$<CONFIG:Release>:-DNDEBUG>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:-DNDEBUG>)
add_compile_options($<$<CONFIG:Debug>:/Od>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) # /MT will static link the VC runtime library, so it doesn't need to be installed on the target machine
add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options(/guard:cf)
add_compile_options(/Zo) # make optimized builds debugging easier. /Zo is the newer documented flag.
add_compile_options(/nologo) # Suppress Startup Banner
Expand All@@ -41,6 +42,11 @@ if(WIN32)
add_compile_options(/Zc:inline)
add_compile_options(/fp:precise)
add_compile_options(/EHsc)
add_compile_options(/Brepro)
add_compile_options(/d1nodatetime)
add_compile_options(/experimental:deterministic)
add_compile_options(/GL)
add_compile_options(/d2CastGuardFailureMode:fastfail)

# From here below are warnings required to be explicitly enabled.
add_compile_options(/w34242)
Expand All@@ -62,27 +68,27 @@ if(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864")

set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf /Brepro")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf /Brepro")

# Enable native source link if the source link file exists
if(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
endif(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})

# Debug build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/NOVCFEATURE")
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")

# Release build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")

# RelWithDebInfo specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
list(APPEND RESOURCES $ENV{__IntermediatesDir}/NativeVersion.rc)
else()
add_compile_options(-Wno-unused-local-typedef)
Expand Down
12 changes: 11 additions & 1 deletion src/Native/Native.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<GenerateNativeVersionInfo>true</GenerateNativeVersionInfo>
<NativeVersionFile>$(IntermediateOutputPath)_version.h</NativeVersionFile>
<NativeSourceLinkFile>$(IntermediateOutputPath)native.sourcelink.json</NativeSourceLinkFile>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
Expand DownExpand Up@@ -120,7 +121,7 @@

<Target Name="BuildNativeWindows"
Condition="'$(OS)' == 'Windows_NT'"
DependsOnTargets="GenerateNativeVersionFile">
DependsOnTargets="GenerateNativeVersionFile;GenerateNativeSourcelinkFile">

<PropertyGroup>
<BuildArgs>$(Configuration) $(TargetArchitecture) --mkllibpath $(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsVersion)\runtimes\$(PackageRid)\native</BuildArgs>
Expand DownExpand Up@@ -248,6 +249,15 @@

</Target>

<Target Name="GenerateNativeSourcelinkFile"
DependsOnTargets="GenerateSourceLinkFile"
Condition="'$(DisableSourceLink)' != 'true' and '$(OS)' == 'Windows_NT'"
Inputs="$(SourceLink)"
Outputs="$(NativeSourceLinkFile)">
<Error Condition="'$(SourceLink)' == ''" Text="Please set SourceLink to forward appropriate information for sourcelink."/>
<Copy SourceFiles="$(SourceLink)" DestinationFiles="$(NativeSourceLinkFile)" />
</Target>

<Target Name="Pack" />
<Target Name="Test" />

Expand Down
16 changes: 14 additions & 2 deletions src/Native/build.cmd
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@ setlocal

:: Store current script directory before %~dp0 gets affected by another process later.
set __currentScriptDir=%~dp0
set "__currentScriptDir=%__currentScriptDir:~0,-1%"


:SetupArgs
:: Initialize the args that will be passed to cmake
set __rootDir=%__currentScriptDir%..\..
set __rootDir=%__currentScriptDir%\..\..
set __artifactsDir=%__rootDir%\artifacts
set __binDir=%__artifactsDir%\bin
set __objDir=%__artifactsDir%\obj
Expand DownExpand Up@@ -51,7 +53,9 @@ set "VSCMD_START_DIR=%__currentScriptDir%"
call "%_VSCOMNTOOLS%\VsDevCmd.bat"

:RunVCVars
if "%VisualStudioVersion%"=="17.0" (
if "%VisualStudioVersion%"=="18.0" (
goto :VS2026
) else if "%VisualStudioVersion%"=="17.0" (
goto :VS2022
) else if "%VisualStudioVersion%"=="16.0" (
goto :VS2019
Expand All@@ -67,6 +71,14 @@ echo Error: Visual Studio 2015, 2017, 2019, or 2022 required
echo Please see https://github.com/dotnet/machinelearning/tree/main/Documentation for build instructions.
exit /b 1

:VS2026
:: Setup vars for VS2026
set __PlatformToolset=v145
set __VSVersion=18 2026
:: Set the environment for the native build
call "%VS180COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch%
goto :SetupDirs

:VS2022
:: Setup vars for VS2022
set __PlatformToolset=v143
Expand Down
1 change: 1 addition & 0 deletions src/Native/gen-buildsys-win.bat
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ if /i "%3" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64)
if /i "%3" == "x86" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A Win32)
if /i "%3" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm64)
if /i "%3" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm)
echo "%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
Comment thread
ericstj marked this conversation as resolved.
"%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
endlocal
GOTO :DONE
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions build/vsts-ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@ extends:
enabled: true
tsa:
enabled: true
settings:
networkIsolationPolicy: Permissive,CFSClean
pool:
name: $(DncEngInternalBuildPool)
image: $(WindowsImage)
Expand Down
32 changes: 19 additions & 13 deletions src/Native/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,9 @@ set(RESOURCES)
# Include 'bin/obj' dir since it contains _version.h
include_directories("$ENV{__IntermediatesDir}")

# Define path to native source link file
set(NATIVE_SOURCELINK_FILE_PATH "$ENV{__IntermediatesDir}/native.sourcelink.json")

if(WIN32)
add_definitions(-DWIN32)
add_definitions(-D_WIN32=1)
Expand All@@ -22,11 +25,9 @@ if(WIN32)
endif()
add_compile_options($<$<CONFIG:Debug>:-DDEBUG>)
add_compile_options($<$<CONFIG:Release>:-DNDEBUG>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:-DNDEBUG>)
add_compile_options($<$<CONFIG:Debug>:/Od>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) # /MT will static link the VC runtime library, so it doesn't need to be installed on the target machine
add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options(/guard:cf)
add_compile_options(/Zo) # make optimized builds debugging easier. /Zo is the newer documented flag.
add_compile_options(/nologo) # Suppress Startup Banner
Expand All@@ -41,6 +42,11 @@ if(WIN32)
add_compile_options(/Zc:inline)
add_compile_options(/fp:precise)
add_compile_options(/EHsc)
add_compile_options(/Brepro)
add_compile_options(/d1nodatetime)
add_compile_options(/experimental:deterministic)
add_compile_options(/GL)
add_compile_options(/d2CastGuardFailureMode:fastfail)

# From here below are warnings required to be explicitly enabled.
add_compile_options(/w34242)
Expand All@@ -62,27 +68,27 @@ if(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864")

set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf /Brepro")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf /Brepro")

# Enable native source link if the source link file exists
if(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
endif(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})

# Debug build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/NOVCFEATURE")
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")

# Release build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")

# RelWithDebInfo specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
list(APPEND RESOURCES $ENV{__IntermediatesDir}/NativeVersion.rc)
else()
add_compile_options(-Wno-unused-local-typedef)
Expand Down
12 changes: 11 additions & 1 deletion src/Native/Native.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<GenerateNativeVersionInfo>true</GenerateNativeVersionInfo>
<NativeVersionFile>$(IntermediateOutputPath)_version.h</NativeVersionFile>
<NativeSourceLinkFile>$(IntermediateOutputPath)native.sourcelink.json</NativeSourceLinkFile>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
Expand DownExpand Up@@ -120,7 +121,7 @@

<Target Name="BuildNativeWindows"
Condition="'$(OS)' == 'Windows_NT'"
DependsOnTargets="GenerateNativeVersionFile">
DependsOnTargets="GenerateNativeVersionFile;GenerateNativeSourcelinkFile">

<PropertyGroup>
<BuildArgs>$(Configuration) $(TargetArchitecture) --mkllibpath $(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsVersion)\runtimes\$(PackageRid)\native</BuildArgs>
Expand DownExpand Up@@ -248,6 +249,15 @@

</Target>

<Target Name="GenerateNativeSourcelinkFile"
DependsOnTargets="GenerateSourceLinkFile"
Condition="'$(DisableSourceLink)' != 'true' and '$(OS)' == 'Windows_NT'"
Inputs="$(SourceLink)"
Outputs="$(NativeSourceLinkFile)">
<Error Condition="'$(SourceLink)' == ''" Text="Please set SourceLink to forward appropriate information for sourcelink."/>
<Copy SourceFiles="$(SourceLink)" DestinationFiles="$(NativeSourceLinkFile)" />
</Target>

<Target Name="Pack" />
<Target Name="Test" />

Expand Down
16 changes: 14 additions & 2 deletions src/Native/build.cmd
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@ setlocal

:: Store current script directory before %~dp0 gets affected by another process later.
set __currentScriptDir=%~dp0
set "__currentScriptDir=%__currentScriptDir:~0,-1%"


:SetupArgs
:: Initialize the args that will be passed to cmake
set __rootDir=%__currentScriptDir%..\..
set __rootDir=%__currentScriptDir%\..\..
set __artifactsDir=%__rootDir%\artifacts
set __binDir=%__artifactsDir%\bin
set __objDir=%__artifactsDir%\obj
Expand DownExpand Up@@ -51,7 +53,9 @@ set "VSCMD_START_DIR=%__currentScriptDir%"
call "%_VSCOMNTOOLS%\VsDevCmd.bat"

:RunVCVars
if "%VisualStudioVersion%"=="17.0" (
if "%VisualStudioVersion%"=="18.0" (
goto :VS2026
) else if "%VisualStudioVersion%"=="17.0" (
goto :VS2022
) else if "%VisualStudioVersion%"=="16.0" (
goto :VS2019
Expand All@@ -67,6 +71,14 @@ echo Error: Visual Studio 2015, 2017, 2019, or 2022 required
echo Please see https://github.com/dotnet/machinelearning/tree/main/Documentation for build instructions.
exit /b 1

:VS2026
:: Setup vars for VS2026
set __PlatformToolset=v145
set __VSVersion=18 2026
:: Set the environment for the native build
call "%VS180COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch%
goto :SetupDirs

:VS2022
:: Setup vars for VS2022
set __PlatformToolset=v143
Expand Down
1 change: 1 addition & 0 deletions src/Native/gen-buildsys-win.bat
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ if /i "%3" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64)
if /i "%3" == "x86" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A Win32)
if /i "%3" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm64)
if /i "%3" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm)
echo "%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
Comment thread
ericstj marked this conversation as resolved.
"%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
endlocal
GOTO :DONE
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions build/vsts-ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@ extends:
enabled: true
tsa:
enabled: true
settings:
networkIsolationPolicy: Permissive,CFSClean
pool:
name: $(DncEngInternalBuildPool)
image: $(WindowsImage)
Expand Down
32 changes: 19 additions & 13 deletions src/Native/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,9 @@ set(RESOURCES)
# Include 'bin/obj' dir since it contains _version.h
include_directories("$ENV{__IntermediatesDir}")

# Define path to native source link file
set(NATIVE_SOURCELINK_FILE_PATH "$ENV{__IntermediatesDir}/native.sourcelink.json")

if(WIN32)
add_definitions(-DWIN32)
add_definitions(-D_WIN32=1)
Expand All@@ -22,11 +25,9 @@ if(WIN32)
endif()
add_compile_options($<$<CONFIG:Debug>:-DDEBUG>)
add_compile_options($<$<CONFIG:Release>:-DNDEBUG>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:-DNDEBUG>)
add_compile_options($<$<CONFIG:Debug>:/Od>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) # /MT will static link the VC runtime library, so it doesn't need to be installed on the target machine
add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options(/guard:cf)
add_compile_options(/Zo) # make optimized builds debugging easier. /Zo is the newer documented flag.
add_compile_options(/nologo) # Suppress Startup Banner
Expand All@@ -41,6 +42,11 @@ if(WIN32)
add_compile_options(/Zc:inline)
add_compile_options(/fp:precise)
add_compile_options(/EHsc)
add_compile_options(/Brepro)
add_compile_options(/d1nodatetime)
add_compile_options(/experimental:deterministic)
add_compile_options(/GL)
add_compile_options(/d2CastGuardFailureMode:fastfail)

# From here below are warnings required to be explicitly enabled.
add_compile_options(/w34242)
Expand All@@ -62,27 +68,27 @@ if(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864")

set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf /Brepro")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf /Brepro")

# Enable native source link if the source link file exists
if(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
endif(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})

# Debug build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/NOVCFEATURE")
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")

# Release build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")

# RelWithDebInfo specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
list(APPEND RESOURCES $ENV{__IntermediatesDir}/NativeVersion.rc)
else()
add_compile_options(-Wno-unused-local-typedef)
Expand Down
12 changes: 11 additions & 1 deletion src/Native/Native.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<GenerateNativeVersionInfo>true</GenerateNativeVersionInfo>
<NativeVersionFile>$(IntermediateOutputPath)_version.h</NativeVersionFile>
<NativeSourceLinkFile>$(IntermediateOutputPath)native.sourcelink.json</NativeSourceLinkFile>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
Expand DownExpand Up@@ -120,7 +121,7 @@

<Target Name="BuildNativeWindows"
Condition="'$(OS)' == 'Windows_NT'"
DependsOnTargets="GenerateNativeVersionFile">
DependsOnTargets="GenerateNativeVersionFile;GenerateNativeSourcelinkFile">

<PropertyGroup>
<BuildArgs>$(Configuration) $(TargetArchitecture) --mkllibpath $(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsVersion)\runtimes\$(PackageRid)\native</BuildArgs>
Expand DownExpand Up@@ -248,6 +249,15 @@

</Target>

<Target Name="GenerateNativeSourcelinkFile"
DependsOnTargets="GenerateSourceLinkFile"
Condition="'$(DisableSourceLink)' != 'true' and '$(OS)' == 'Windows_NT'"
Inputs="$(SourceLink)"
Outputs="$(NativeSourceLinkFile)">
<Error Condition="'$(SourceLink)' == ''" Text="Please set SourceLink to forward appropriate information for sourcelink."/>
<Copy SourceFiles="$(SourceLink)" DestinationFiles="$(NativeSourceLinkFile)" />
</Target>

<Target Name="Pack" />
<Target Name="Test" />

Expand Down
16 changes: 14 additions & 2 deletions src/Native/build.cmd
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@ setlocal

:: Store current script directory before %~dp0 gets affected by another process later.
set __currentScriptDir=%~dp0
set "__currentScriptDir=%__currentScriptDir:~0,-1%"


:SetupArgs
:: Initialize the args that will be passed to cmake
set __rootDir=%__currentScriptDir%..\..
set __rootDir=%__currentScriptDir%\..\..
set __artifactsDir=%__rootDir%\artifacts
set __binDir=%__artifactsDir%\bin
set __objDir=%__artifactsDir%\obj
Expand DownExpand Up@@ -51,7 +53,9 @@ set "VSCMD_START_DIR=%__currentScriptDir%"
call "%_VSCOMNTOOLS%\VsDevCmd.bat"

:RunVCVars
if "%VisualStudioVersion%"=="17.0" (
if "%VisualStudioVersion%"=="18.0" (
goto :VS2026
) else if "%VisualStudioVersion%"=="17.0" (
goto :VS2022
) else if "%VisualStudioVersion%"=="16.0" (
goto :VS2019
Expand All@@ -67,6 +71,14 @@ echo Error: Visual Studio 2015, 2017, 2019, or 2022 required
echo Please see https://github.com/dotnet/machinelearning/tree/main/Documentation for build instructions.
exit /b 1

:VS2026
:: Setup vars for VS2026
set __PlatformToolset=v145
set __VSVersion=18 2026
:: Set the environment for the native build
call "%VS180COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch%
goto :SetupDirs

:VS2022
:: Setup vars for VS2022
set __PlatformToolset=v143
Expand Down
1 change: 1 addition & 0 deletions src/Native/gen-buildsys-win.bat
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ if /i "%3" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64)
if /i "%3" == "x86" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A Win32)
if /i "%3" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm64)
if /i "%3" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm)
echo "%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
Comment thread
ericstj marked this conversation as resolved.
"%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
endlocal
GOTO :DONE
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions build/vsts-ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@ extends:
enabled: true
tsa:
enabled: true
settings:
networkIsolationPolicy: Permissive,CFSClean
pool:
name: $(DncEngInternalBuildPool)
image: $(WindowsImage)
Expand Down
32 changes: 19 additions & 13 deletions src/Native/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,9 @@ set(RESOURCES)
# Include 'bin/obj' dir since it contains _version.h
include_directories("$ENV{__IntermediatesDir}")

# Define path to native source link file
set(NATIVE_SOURCELINK_FILE_PATH "$ENV{__IntermediatesDir}/native.sourcelink.json")

if(WIN32)
add_definitions(-DWIN32)
add_definitions(-D_WIN32=1)
Expand All@@ -22,11 +25,9 @@ if(WIN32)
endif()
add_compile_options($<$<CONFIG:Debug>:-DDEBUG>)
add_compile_options($<$<CONFIG:Release>:-DNDEBUG>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:-DNDEBUG>)
add_compile_options($<$<CONFIG:Debug>:/Od>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) # /MT will static link the VC runtime library, so it doesn't need to be installed on the target machine
add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options(/guard:cf)
add_compile_options(/Zo) # make optimized builds debugging easier. /Zo is the newer documented flag.
add_compile_options(/nologo) # Suppress Startup Banner
Expand All@@ -41,6 +42,11 @@ if(WIN32)
add_compile_options(/Zc:inline)
add_compile_options(/fp:precise)
add_compile_options(/EHsc)
add_compile_options(/Brepro)
add_compile_options(/d1nodatetime)
add_compile_options(/experimental:deterministic)
add_compile_options(/GL)
add_compile_options(/d2CastGuardFailureMode:fastfail)

# From here below are warnings required to be explicitly enabled.
add_compile_options(/w34242)
Expand All@@ -62,27 +68,27 @@ if(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864")

set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf /Brepro")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf /Brepro")

# Enable native source link if the source link file exists
if(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
endif(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})

# Debug build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/NOVCFEATURE")
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")

# Release build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")

# RelWithDebInfo specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
list(APPEND RESOURCES $ENV{__IntermediatesDir}/NativeVersion.rc)
else()
add_compile_options(-Wno-unused-local-typedef)
Expand Down
12 changes: 11 additions & 1 deletion src/Native/Native.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<GenerateNativeVersionInfo>true</GenerateNativeVersionInfo>
<NativeVersionFile>$(IntermediateOutputPath)_version.h</NativeVersionFile>
<NativeSourceLinkFile>$(IntermediateOutputPath)native.sourcelink.json</NativeSourceLinkFile>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
Expand DownExpand Up@@ -120,7 +121,7 @@

<Target Name="BuildNativeWindows"
Condition="'$(OS)' == 'Windows_NT'"
DependsOnTargets="GenerateNativeVersionFile">
DependsOnTargets="GenerateNativeVersionFile;GenerateNativeSourcelinkFile">

<PropertyGroup>
<BuildArgs>$(Configuration) $(TargetArchitecture) --mkllibpath $(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsVersion)\runtimes\$(PackageRid)\native</BuildArgs>
Expand DownExpand Up@@ -248,6 +249,15 @@

</Target>

<Target Name="GenerateNativeSourcelinkFile"
DependsOnTargets="GenerateSourceLinkFile"
Condition="'$(DisableSourceLink)' != 'true' and '$(OS)' == 'Windows_NT'"
Inputs="$(SourceLink)"
Outputs="$(NativeSourceLinkFile)">
<Error Condition="'$(SourceLink)' == ''" Text="Please set SourceLink to forward appropriate information for sourcelink."/>
<Copy SourceFiles="$(SourceLink)" DestinationFiles="$(NativeSourceLinkFile)" />
</Target>

<Target Name="Pack" />
<Target Name="Test" />

Expand Down
16 changes: 14 additions & 2 deletions src/Native/build.cmd
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@ setlocal

:: Store current script directory before %~dp0 gets affected by another process later.
set __currentScriptDir=%~dp0
set "__currentScriptDir=%__currentScriptDir:~0,-1%"


:SetupArgs
:: Initialize the args that will be passed to cmake
set __rootDir=%__currentScriptDir%..\..
set __rootDir=%__currentScriptDir%\..\..
set __artifactsDir=%__rootDir%\artifacts
set __binDir=%__artifactsDir%\bin
set __objDir=%__artifactsDir%\obj
Expand DownExpand Up@@ -51,7 +53,9 @@ set "VSCMD_START_DIR=%__currentScriptDir%"
call "%_VSCOMNTOOLS%\VsDevCmd.bat"

:RunVCVars
if "%VisualStudioVersion%"=="17.0" (
if "%VisualStudioVersion%"=="18.0" (
goto :VS2026
) else if "%VisualStudioVersion%"=="17.0" (
goto :VS2022
) else if "%VisualStudioVersion%"=="16.0" (
goto :VS2019
Expand All@@ -67,6 +71,14 @@ echo Error: Visual Studio 2015, 2017, 2019, or 2022 required
echo Please see https://github.com/dotnet/machinelearning/tree/main/Documentation for build instructions.
exit /b 1

:VS2026
:: Setup vars for VS2026
set __PlatformToolset=v145
set __VSVersion=18 2026
:: Set the environment for the native build
call "%VS180COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch%
goto :SetupDirs

:VS2022
:: Setup vars for VS2022
set __PlatformToolset=v143
Expand Down
1 change: 1 addition & 0 deletions src/Native/gen-buildsys-win.bat
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ if /i "%3" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64)
if /i "%3" == "x86" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A Win32)
if /i "%3" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm64)
if /i "%3" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm)
echo "%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
Comment thread
ericstj marked this conversation as resolved.
"%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
endlocal
GOTO :DONE
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions build/vsts-ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@ extends:
enabled: true
tsa:
enabled: true
settings:
networkIsolationPolicy: Permissive,CFSClean
pool:
name: $(DncEngInternalBuildPool)
image: $(WindowsImage)
Expand Down
32 changes: 19 additions & 13 deletions src/Native/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,9 @@ set(RESOURCES)
# Include 'bin/obj' dir since it contains _version.h
include_directories("$ENV{__IntermediatesDir}")

# Define path to native source link file
set(NATIVE_SOURCELINK_FILE_PATH "$ENV{__IntermediatesDir}/native.sourcelink.json")

if(WIN32)
add_definitions(-DWIN32)
add_definitions(-D_WIN32=1)
Expand All@@ -22,11 +25,9 @@ if(WIN32)
endif()
add_compile_options($<$<CONFIG:Debug>:-DDEBUG>)
add_compile_options($<$<CONFIG:Release>:-DNDEBUG>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:-DNDEBUG>)
add_compile_options($<$<CONFIG:Debug>:/Od>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) # /MT will static link the VC runtime library, so it doesn't need to be installed on the target machine
add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options(/guard:cf)
add_compile_options(/Zo) # make optimized builds debugging easier. /Zo is the newer documented flag.
add_compile_options(/nologo) # Suppress Startup Banner
Expand All@@ -41,6 +42,11 @@ if(WIN32)
add_compile_options(/Zc:inline)
add_compile_options(/fp:precise)
add_compile_options(/EHsc)
add_compile_options(/Brepro)
add_compile_options(/d1nodatetime)
add_compile_options(/experimental:deterministic)
add_compile_options(/GL)
add_compile_options(/d2CastGuardFailureMode:fastfail)

# From here below are warnings required to be explicitly enabled.
add_compile_options(/w34242)
Expand All@@ -62,27 +68,27 @@ if(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864")

set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf /Brepro")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf /Brepro")

# Enable native source link if the source link file exists
if(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
endif(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})

# Debug build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/NOVCFEATURE")
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")

# Release build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")

# RelWithDebInfo specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
list(APPEND RESOURCES $ENV{__IntermediatesDir}/NativeVersion.rc)
else()
add_compile_options(-Wno-unused-local-typedef)
Expand Down
12 changes: 11 additions & 1 deletion src/Native/Native.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<GenerateNativeVersionInfo>true</GenerateNativeVersionInfo>
<NativeVersionFile>$(IntermediateOutputPath)_version.h</NativeVersionFile>
<NativeSourceLinkFile>$(IntermediateOutputPath)native.sourcelink.json</NativeSourceLinkFile>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
Expand DownExpand Up@@ -120,7 +121,7 @@

<Target Name="BuildNativeWindows"
Condition="'$(OS)' == 'Windows_NT'"
DependsOnTargets="GenerateNativeVersionFile">
DependsOnTargets="GenerateNativeVersionFile;GenerateNativeSourcelinkFile">

<PropertyGroup>
<BuildArgs>$(Configuration) $(TargetArchitecture) --mkllibpath $(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsVersion)\runtimes\$(PackageRid)\native</BuildArgs>
Expand DownExpand Up@@ -248,6 +249,15 @@

</Target>

<Target Name="GenerateNativeSourcelinkFile"
DependsOnTargets="GenerateSourceLinkFile"
Condition="'$(DisableSourceLink)' != 'true' and '$(OS)' == 'Windows_NT'"
Inputs="$(SourceLink)"
Outputs="$(NativeSourceLinkFile)">
<Error Condition="'$(SourceLink)' == ''" Text="Please set SourceLink to forward appropriate information for sourcelink."/>
<Copy SourceFiles="$(SourceLink)" DestinationFiles="$(NativeSourceLinkFile)" />
</Target>

<Target Name="Pack" />
<Target Name="Test" />

Expand Down
16 changes: 14 additions & 2 deletions src/Native/build.cmd
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@ setlocal

:: Store current script directory before %~dp0 gets affected by another process later.
set __currentScriptDir=%~dp0
set "__currentScriptDir=%__currentScriptDir:~0,-1%"


:SetupArgs
:: Initialize the args that will be passed to cmake
set __rootDir=%__currentScriptDir%..\..
set __rootDir=%__currentScriptDir%\..\..
set __artifactsDir=%__rootDir%\artifacts
set __binDir=%__artifactsDir%\bin
set __objDir=%__artifactsDir%\obj
Expand DownExpand Up@@ -51,7 +53,9 @@ set "VSCMD_START_DIR=%__currentScriptDir%"
call "%_VSCOMNTOOLS%\VsDevCmd.bat"

:RunVCVars
if "%VisualStudioVersion%"=="17.0" (
if "%VisualStudioVersion%"=="18.0" (
goto :VS2026
) else if "%VisualStudioVersion%"=="17.0" (
goto :VS2022
) else if "%VisualStudioVersion%"=="16.0" (
goto :VS2019
Expand All@@ -67,6 +71,14 @@ echo Error: Visual Studio 2015, 2017, 2019, or 2022 required
echo Please see https://github.com/dotnet/machinelearning/tree/main/Documentation for build instructions.
exit /b 1

:VS2026
:: Setup vars for VS2026
set __PlatformToolset=v145
set __VSVersion=18 2026
:: Set the environment for the native build
call "%VS180COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch%
goto :SetupDirs

:VS2022
:: Setup vars for VS2022
set __PlatformToolset=v143
Expand Down
1 change: 1 addition & 0 deletions src/Native/gen-buildsys-win.bat
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ if /i "%3" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64)
if /i "%3" == "x86" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A Win32)
if /i "%3" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm64)
if /i "%3" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm)
echo "%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
Comment thread
ericstj marked this conversation as resolved.
"%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
endlocal
GOTO :DONE
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions build/vsts-ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,8 @@ extends:
enabled: true
tsa:
enabled: true
settings:
networkIsolationPolicy: Permissive,CFSClean
pool:
name: $(DncEngInternalBuildPool)
image: $(WindowsImage)
Expand Down
32 changes: 19 additions & 13 deletions src/Native/CMakeLists.txt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,9 @@ set(RESOURCES)
# Include 'bin/obj' dir since it contains _version.h
include_directories("$ENV{__IntermediatesDir}")

# Define path to native source link file
set(NATIVE_SOURCELINK_FILE_PATH "$ENV{__IntermediatesDir}/native.sourcelink.json")

if(WIN32)
add_definitions(-DWIN32)
add_definitions(-D_WIN32=1)
Expand All@@ -22,11 +25,9 @@ if(WIN32)
endif()
add_compile_options($<$<CONFIG:Debug>:-DDEBUG>)
add_compile_options($<$<CONFIG:Release>:-DNDEBUG>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:-DNDEBUG>)
add_compile_options($<$<CONFIG:Debug>:/Od>)
add_compile_options($<$<CONFIG:Debug>:/MTd>) # /MT will static link the VC runtime library, so it doesn't need to be installed on the target machine
add_compile_options($<$<CONFIG:Release>:/MT>)
add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
add_compile_options(/guard:cf)
add_compile_options(/Zo) # make optimized builds debugging easier. /Zo is the newer documented flag.
add_compile_options(/nologo) # Suppress Startup Banner
Expand All@@ -41,6 +42,11 @@ if(WIN32)
add_compile_options(/Zc:inline)
add_compile_options(/fp:precise)
add_compile_options(/EHsc)
add_compile_options(/Brepro)
add_compile_options(/d1nodatetime)
add_compile_options(/experimental:deterministic)
add_compile_options(/GL)
add_compile_options(/d2CastGuardFailureMode:fastfail)

# From here below are warnings required to be explicitly enabled.
add_compile_options(/w34242)
Expand All@@ -62,27 +68,27 @@ if(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864")

set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf /Brepro")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf /Brepro")

# Enable native source link if the source link file exists
if(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /sourcelink:${NATIVE_SOURCELINK_FILE_PATH}")
endif(EXISTS ${NATIVE_SOURCELINK_FILE_PATH})

# Debug build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/NOVCFEATURE")
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:vcompd.lib /DEFAULTLIB:vcomp.lib")

# Release build specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")

# RelWithDebInfo specific flags
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")
list(APPEND RESOURCES $ENV{__IntermediatesDir}/NativeVersion.rc)
else()
add_compile_options(-Wno-unused-local-typedef)
Expand Down
12 changes: 11 additions & 1 deletion src/Native/Native.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<GenerateNativeVersionInfo>true</GenerateNativeVersionInfo>
<NativeVersionFile>$(IntermediateOutputPath)_version.h</NativeVersionFile>
<NativeSourceLinkFile>$(IntermediateOutputPath)native.sourcelink.json</NativeSourceLinkFile>
</PropertyGroup>

<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
Expand DownExpand Up@@ -120,7 +121,7 @@

<Target Name="BuildNativeWindows"
Condition="'$(OS)' == 'Windows_NT'"
DependsOnTargets="GenerateNativeVersionFile">
DependsOnTargets="GenerateNativeVersionFile;GenerateNativeSourcelinkFile">

<PropertyGroup>
<BuildArgs>$(Configuration) $(TargetArchitecture) --mkllibpath $(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsVersion)\runtimes\$(PackageRid)\native</BuildArgs>
Expand DownExpand Up@@ -248,6 +249,15 @@

</Target>

<Target Name="GenerateNativeSourcelinkFile"
DependsOnTargets="GenerateSourceLinkFile"
Condition="'$(DisableSourceLink)' != 'true' and '$(OS)' == 'Windows_NT'"
Inputs="$(SourceLink)"
Outputs="$(NativeSourceLinkFile)">
<Error Condition="'$(SourceLink)' == ''" Text="Please set SourceLink to forward appropriate information for sourcelink."/>
<Copy SourceFiles="$(SourceLink)" DestinationFiles="$(NativeSourceLinkFile)" />
</Target>

<Target Name="Pack" />
<Target Name="Test" />

Expand Down
16 changes: 14 additions & 2 deletions src/Native/build.cmd
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,12 @@ setlocal

:: Store current script directory before %~dp0 gets affected by another process later.
set __currentScriptDir=%~dp0
set "__currentScriptDir=%__currentScriptDir:~0,-1%"


:SetupArgs
:: Initialize the args that will be passed to cmake
set __rootDir=%__currentScriptDir%..\..
set __rootDir=%__currentScriptDir%\..\..
set __artifactsDir=%__rootDir%\artifacts
set __binDir=%__artifactsDir%\bin
set __objDir=%__artifactsDir%\obj
Expand DownExpand Up@@ -51,7 +53,9 @@ set "VSCMD_START_DIR=%__currentScriptDir%"
call "%_VSCOMNTOOLS%\VsDevCmd.bat"

:RunVCVars
if "%VisualStudioVersion%"=="17.0" (
if "%VisualStudioVersion%"=="18.0" (
goto :VS2026
) else if "%VisualStudioVersion%"=="17.0" (
goto :VS2022
) else if "%VisualStudioVersion%"=="16.0" (
goto :VS2019
Expand All@@ -67,6 +71,14 @@ echo Error: Visual Studio 2015, 2017, 2019, or 2022 required
echo Please see https://github.com/dotnet/machinelearning/tree/main/Documentation for build instructions.
exit /b 1

:VS2026
:: Setup vars for VS2026
set __PlatformToolset=v145
set __VSVersion=18 2026
:: Set the environment for the native build
call "%VS180COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch%
goto :SetupDirs

:VS2022
:: Setup vars for VS2022
set __PlatformToolset=v143
Expand Down
1 change: 1 addition & 0 deletions src/Native/gen-buildsys-win.bat
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ if /i "%3" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64)
if /i "%3" == "x86" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A Win32)
if /i "%3" == "arm64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm64)
if /i "%3" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A arm)
echo "%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
Comment thread
ericstj marked this conversation as resolved.
"%CMakePath%" "-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE%" "-DCMAKE_INSTALL_PREFIX=%__CMakeBinDir%" "-DMKL_LIB_PATH=%MKL_LIB_PATH%" "-DONEDAL_DEVEL_PATH=%ONEDAL_DEVEL_PATH%" "-DONETBB_DEVEL_PATH=%ONETBB_DEVEL_PATH%" "-DARCHITECTURE=%3" -G "Visual Studio %__VSString%" %__ExtraCmakeParams% -B. -H%1
endlocal
GOTO :DONE
Expand Down
Loading