microsoft
/
CNTK
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

further reduce # instance of version defintions

This commit is contained in:
Zhou Wang 2017-04-12 10:31:59 +02:00
Родитель 39c7738173
Коммит 071367f8cb
5 изменённых файлов: 12 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
CNTK.Common.props
Просмотреть файл

@ -27,7 +27,7 @@
<HasSwig Condition="Exists('$(SWIG_PATH)\swig.exe')">true</HasSwig> <HasSwig Condition="Exists('$(SWIG_PATH)\swig.exe')">true</HasSwig>
<CntkComponentVersion>2.0rc1</CntkComponentVersion> <CntkComponentVersion>2.0rc1</CntkComponentVersion>
<CntkComponentVersion Condition="$(DebugBuild)">2.0rc1d</CntkComponentVersion> <CntkComponentVersion Condition="$(DebugBuild)">$(CntkComponentVersion)d</CntkComponentVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

6
Makefile
Просмотреть файл

@ -269,11 +269,9 @@ ORIGINDIR:='$$ORIGIN'
# Components VERSION info # Components VERSION info
######################################## ########################################
ifeq ("$(BUILDTYPE)","release") CNTK_COMPONENT_VERSION := 2.0rc1
CNTK_COMPONENT_VERSION=2.0rc1
endif
ifeq ("$(BUILDTYPE)","debug") ifeq ("$(BUILDTYPE)","debug")
CNTK_COMPONENT_VERSION=2.0rc1d CNTK_COMPONENT_VERSION := $(CNTK_COMPONENT_VERSION)d
endif endif
CPPFLAGS += -DCNTK_COMPONENT_VERSION="$(CNTK_COMPONENT_VERSION)" CPPFLAGS += -DCNTK_COMPONENT_VERSION="$(CNTK_COMPONENT_VERSION)"

6
Tests/EndToEndTests/EvalClientTests/CNTKLibraryCSEvalExamplesTest/CNTKLibraryCSEvalExamplesTest.csproj
Просмотреть файл

@ -22,11 +22,11 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
<!-- Explicitly defines the version of the depenent assemblies to avoid build errors or stale binaries --> <!-- Explicitly defines the version of the dependent assemblies to avoid build errors or stale binaries. -->
<!-- The change of CNTK_COMPONENT_VERSION in CNTK.Common.props cannot be populated correctly without restarting VS --> <!-- The change of CntkComponentVersion in CNTK.Common.props cannot be populated correctly without restarting VS and cleaning solution. -->
<PropertyGroup> <PropertyGroup>
<CntkCsAssemblyVersion>2.0rc1</CntkCsAssemblyVersion> <CntkCsAssemblyVersion>2.0rc1</CntkCsAssemblyVersion>
<CntkCsAssemblyVersion Condition="$(DebugBuild)">2.0rc1d</CntkCsAssemblyVersion> <CntkCsAssemblyVersion Condition="$(DebugBuild)">$(CntkCsAssemblyVersion)d</CntkCsAssemblyVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="$(DebugBuild)"> <PropertyGroup Condition="$(DebugBuild)">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

6
Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/CSEvalClientTest.csproj
Просмотреть файл

@ -22,11 +22,11 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
<!-- Explicitly defines the version of the depenent assemblies to avoid build errors or stale binaries --> <!-- Explicitly defines the version of the dependent assemblies to avoid build errors or stale binaries -->
<!-- The change of CNTK_COMPONENT_VERSION in CNTK.Common.props cannot be populated correctly without restarting VS --> <!-- The change of CntkComponentVersion in CNTK.Common.props cannot be populated correctly without restarting VS and cleaning solution. -->
<PropertyGroup> <PropertyGroup>
<CntkCsAssemblyVersion>2.0rc1</CntkCsAssemblyVersion> <CntkCsAssemblyVersion>2.0rc1</CntkCsAssemblyVersion>
<CntkCsAssemblyVersion Condition="$(DebugBuild)">2.0rc1d</CntkCsAssemblyVersion> <CntkCsAssemblyVersion Condition="$(DebugBuild)">$(CntkCsAssemblyVersion)d</CntkCsAssemblyVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

6
Tests/UnitTests/ManagedEvalTests/ManagedEvalTests.csproj
Просмотреть файл

@ -27,11 +27,11 @@
<IsCodedUITest>False</IsCodedUITest> <IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType> <TestProjectType>UnitTest</TestProjectType>
</PropertyGroup> </PropertyGroup>
<!-- Explicitly defines the version of the depenent assemblies to avoid build errors or stale binaries --> <!-- Explicitly defines the version of the dependent assemblies to avoid build errors or stale binaries -->
<!-- The change of CNTK_COMPONENT_VERSION in CNTK.Common.props cannot be populated correctly without restarting VS --> <!-- The change of CntkComponentVersion in CNTK.Common.props cannot be populated correctly without restarting VS and cleaning solution. -->
<PropertyGroup> <PropertyGroup>
<CntkCsAssemblyVersion>2.0rc1</CntkCsAssemblyVersion> <CntkCsAssemblyVersion>2.0rc1</CntkCsAssemblyVersion>
<CntkCsAssemblyVersion Condition="$(DebugBuild)">2.0rc1d</CntkCsAssemblyVersion> <CntkCsAssemblyVersion Condition="$(DebugBuild)">$(CntkCsAssemblyVersion)d</CntkCsAssemblyVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>