Skip to content
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

Jump to bottom

Changes for MRO-3.5.3 #99

Merged
merged 1 commit into from
May 15, 2019
Merged

Changes for MRO-3.5.3 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runit.revo.common.MKL.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
## This test is part of the Micrsoft R Server Validation Suite

test.dgemm.crossprod <- function(){

DEACTIVATED("Bug 74384: SQLPAL: setMKLthreads(1) crashes sqlpal (RevoIOQ test test.dgemm.crossprod)")


loaded.packages <- search()
if ("package:RevoUtilsMath" %in% loaded.packages)
{
Expand Down
2 changes: 1 addition & 1 deletion additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runit.revo.common.version.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (!identical(system.file(package="RevoMods"), ""))
"test.revor.RevoIOQ.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoIOQ", ver = revover))
"test.revor.RUnit.version" <- function() checkTrue("checkPackageVersion"(pkg = "RUnit", ver = "0.4.26"))
"test.revoparallelr.doParallel.version" <- function() checkTrue("checkPackageVersion"(pkg = "doParallel", ver = "1.0.14"))
"test.revor.RevoUtils.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtils", ver = "11.0.2"))
"test.revor.RevoUtils.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtils", ver = "11.0.3"))
"test.revor.RevoMods.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoMods", ver = "11.0.1"))
} else
{
Expand Down
6 changes: 3 additions & 3 deletions additionalPackages/RevoUtils/DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Package: RevoUtils
Version: 11.0.2
Date: 2019-02-15
Version: 11.0.3
Date: 2019-05-10
Title: Microsoft R Utility Package
Author: Microsoft Corporation
Maintainer: Microsoft Corporation <mrspack@microsoft.com>
SystemRequirements: R (>= 3.0.0)
Description: Utility functions for Microsoft R
License: GPL-2
Copyright: Microsoft Corporation
MRANDate: 2019-02-01
MRANDate: 2019-04-15
2 changes: 1 addition & 1 deletion setup-MRO/ROpen/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Id="*" Name="Microsoft R Open $(var.MroShortVersion)" Language="1033" Version="$(var.MroVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="9A23D6F4-30E1-49A1-A071-06BAE69CF879">
<Product Id="*" Name="Microsoft R Open $(var.MroShortVersion)" Language="1033" Version="$(var.MroVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="8ACB5527-CE3E-4F65-BF00-D47C63FBBBF0">
<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" Platform="x64" />

<PropertyRef Id="NETFRAMEWORK45"/>
Expand Down
2 changes: 1 addition & 1 deletion setup-MRO/ROpen/Setup_en-us.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<String Id="MklInstallDlgLearnMoreLinkText">Intel MKL</String>
<String Id="MklLicenseDlgTitle">{\WixUI_Font_Title}MKL Licensing Information</String>
<String Id="MklLicenseDlgLicenseAcceptedCheckBox">I accept the MKL license terms</String>
<String Id="ShortcutRguiName">Microsoft R Open 3.5.2</String>
<String Id="ShortcutRguiName">Microsoft R Open 3.5.3</String>
<String Id="ExitDialogDescription">Click the Finish button to exit the Setup Wizard and install any additional required software.</String>
<String Id="InvalidNetFramework">This application requires .NET Framework 4.5. Please install the .NET Framework then run this installer again.</String>
</WixLocalization>
2 changes: 1 addition & 1 deletion setup-MRO/ROpenSetupBootstrapper/Bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal ="http://schemas.microsoft.com/wix/BalExtension" xmlns:util ="http://schemas.microsoft.com/wix/UtilExtension">
<Bundle Name="Microsoft R Open $(var.MroShortVersion)" Version="$(var.MroShortVersion).$(var.BuildNumber)" Manufacturer="Microsoft" UpgradeCode="D9F0EF80-3113-449E-8359-6B067DCFAECE">
<Bundle Name="Microsoft R Open $(var.MroShortVersion)" Version="$(var.MroShortVersion).$(var.BuildNumber)" Manufacturer="Microsoft" UpgradeCode="D1916AAE-1475-4A40-8A93-91B5A83D9927">
<BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
<PayloadGroupRef Id ="RSetup"/>
<PayloadGroupRef Id="RInstaller"/>
Expand Down
2 changes: 1 addition & 1 deletion setup-MRO/ROpenSetupBootstrapper/productResource.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productStrings": {
"marketingPrefix": "Microsoft",
"marketingPostfix": "R Open",
"marketingVersion": "3.5.2",
"marketingVersion": "3.5.3",
"marketingDescriptionPrimary": "Microsoft R Open is the enhanced distribution of R from Microsoft Corporation. It is a complete open source platform for statistical analysis and data science.",
"marketingDescriptionSecondary": "You can get more information about Microsoft R Open at",
"marketingUrl": "https://aka.ms/microsoft-r-open-docs",
Expand Down
6 changes: 4 additions & 2 deletions setup-MRO/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,8 @@ RBuildEnvironment.Override("Build", () => {
CreateDirectory("target/MRO/Linux");
CreateDirectory("target/MRO/SLES");
CreateDirectory("stage/tarballStage/microsoft-r-open/rpm");
CreateDirectory("stage/tarballStage/microsoft-r-open/rpm/rhel");
CreateDirectory("stage/tarballStage/microsoft-r-open/rpm/sles");
CreateDirectory("stage/tarballStage/microsoft-r-open/deb");
CopyFile("packageFiles/installScript/install.sh", "stage/tarballStage/microsoft-r-open/install.sh");
ChMod("a+x", "stage/tarballStage/microsoft-r-open/install.sh");
Expand Down Expand Up @@ -766,7 +768,7 @@ Task("AssembleDeliverables").Does(() => {
if (System.IO.Directory.Exists("cmake_build_mro"))
{
CopyFiles("cmake_build_mro/microsoft-r-open*.deb", "stage/tarballStage/microsoft-r-open/deb");
CopyFiles("cmake_build_mro/microsoft-r-open*.rpm", "stage/tarballStage/microsoft-r-open/rpm");
CopyFiles("cmake_build_mro/microsoft-r-open*.rpm", "stage/tarballStage/microsoft-r-open/rpm/rhel");

var tarArgs = "-czvf target/MRO/Linux/microsoft-r-open.tar.gz -C stage/tarballStage microsoft-r-open/";
RunCommand("tar", tarArgs);
Expand All @@ -775,7 +777,7 @@ Task("AssembleDeliverables").Does(() => {
}
else if(System.IO.Directory.Exists("cmake_build_mro_rpm_sles"))
{
CopyFiles("cmake_build_mro_rpm_sles/microsoft-r-open*.rpm", "stage/tarballStage/microsoft-r-open/rpm");
CopyFiles("cmake_build_mro_rpm_sles/microsoft-r-open*.rpm", "stage/tarballStage/microsoft-r-open/rpm/sles");

var tarArgs = "-czvf target/MRO/SLES/microsoft-r-open.tar.gz -C stage/tarballStage microsoft-r-open/";
RunCommand("tar", tarArgs);
Expand Down
8 changes: 4 additions & 4 deletions setup-MRO/global.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@

<MlmVersion Condition="'$(MlmVersion)' == '' ">9.4.7.0</MlmVersion>
<MklVersion Condition="'$(MklVersion)' == '' ">2019.2.0.0</MklVersion>
<MroVersion Condition="'$(MroVersion)' == '' ">3.5.2.0</MroVersion>
<SroVersion Condition="'$(SroVersion)' == '' ">3.5.2.0</SroVersion>
<MroVersion Condition="'$(MroVersion)' == '' ">3.5.3.0</MroVersion>
<SroVersion Condition="'$(SroVersion)' == '' ">3.5.3.0</SroVersion>
<SrsVersion Condition="'$(SrsVersion)' == '' ">9.4.7.0</SrsVersion>
<SpoVersion Condition="'$(SpoVersion)' == '' ">9.4.7.0</SpoVersion>
<SpsVersion Condition="'$(SpsVersion)' == '' ">9.4.7.0</SpsVersion>

<MroPkgsVersion Condition="'$(MroPkgsVersion)' == '' ">3.5.2.0</MroPkgsVersion>
<MroPkgsVersion Condition="'$(MroPkgsVersion)' == '' ">3.5.3.0</MroPkgsVersion>

<MroShortVersion Condition="'$(MroShortVersion)' == '' ">3.5.2</MroShortVersion>
<MroShortVersion Condition="'$(MroShortVersion)' == '' ">3.5.3</MroShortVersion>
<SrsShortVersion Condition="'$(SrsShortVersion)' == '' ">9.4.7</SrsShortVersion>

<OutputBase Condition="'$(OutputBase)' == ''">$(CodeRoot)\target\$(Configuration)</OutputBase>
Expand Down
13 changes: 8 additions & 5 deletions setup-MRO/packageFiles/installScript/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ USE_YUM=false
USE_ZYPPER=false
USE_DPKG=false
USE_RPM=false
DISTRO_NAME=""

INTERNET_CONNECTION=false

Expand Down Expand Up @@ -101,10 +102,12 @@ function check_getopt {
function detect_package_manager {
if [ -f /etc/redhat-release ]; then
USE_YUM=true
DISTRO_NAME="rhel"
elif [ -f /etc/debian_version ]; then
USE_DPKG=true
elif [ -f /etc/SuSE-brand ] || [ -f /etc/SuSE-release ]; then
elif [ -f /etc/SuSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-release ]; then
USE_ZYPPER=true
DISTRO_NAME="sles"
else
echo "Unsupported OS"
exit 1
Expand Down Expand Up @@ -290,15 +293,15 @@ function install_deb_dpkg {
function install {
if [[ ${USE_YUM} == true ]]; then
mkdir -p ${SCRIPT_DIR}/logs
install_rpm_yum ${SCRIPT_DIR}/rpm/microsoft-r-open-mro*.rpm ${SCRIPT_DIR}/logs/mro.txt
install_rpm_yum ${SCRIPT_DIR}/rpm/${DISTRO_NAME}/microsoft-r-open-mro*.rpm ${SCRIPT_DIR}/logs/mro.txt
if [[ ${MKL_EULA_ACCEPTED} == true ]]; then
install_rpm_yum ${SCRIPT_DIR}/rpm/microsoft-r-open-mkl*.rpm ${SCRIPT_DIR}/logs/mkl.txt
install_rpm_yum ${SCRIPT_DIR}/rpm/${DISTRO_NAME}/microsoft-r-open-mkl*.rpm ${SCRIPT_DIR}/logs/mkl.txt
fi
elif [[ ${USE_ZYPPER} == true ]]; then
mkdir -p ${SCRIPT_DIR}/logs
install_rpm_zypper ${SCRIPT_DIR}/rpm/microsoft-r-open-mro*.rpm ${SCRIPT_DIR}/logs/mro.txt
install_rpm_zypper ${SCRIPT_DIR}/rpm/${DISTRO_NAME}/microsoft-r-open-mro*.rpm ${SCRIPT_DIR}/logs/mro.txt
if [[ ${MKL_EULA_ACCEPTED} == true ]]; then
install_rpm_zypper ${SCRIPT_DIR}/rpm/microsoft-r-open-mkl*.rpm ${SCRIPT_DIR}/logs/mkl.txt
install_rpm_zypper ${SCRIPT_DIR}/rpm/${DISTRO_NAME}/microsoft-r-open-mkl*.rpm ${SCRIPT_DIR}/logs/mkl.txt
fi
elif [[ ${USE_DPKG} == true ]]; then
mkdir -p ${SCRIPT_DIR}/logs
Expand Down
2 changes: 1 addition & 1 deletion setup-MRO/packageScripts/intel-mkl/rpm/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
VERSION="3.5.2"
VERSION="3.5.3"
INSTALL_PREFIX="${RPM_INSTALL_PREFIX}/ropen/${VERSION}"

set +f
Expand Down
2 changes: 1 addition & 1 deletion setup-MRO/packageScripts/intel-mkl/rpm/postrm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#Enable shell globbing
set +f

VERSION="3.5.2"
VERSION="3.5.3"
INSTALL_PREFIX="${RPM_INSTALL_PREFIX}/ropen/${VERSION}"

# We will let postinst of installing RPM take care of this if upgrade
Expand Down
2 changes: 1 addition & 1 deletion setup-MRO/packageScripts/intel-mkl/rpm/prerm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [[ "$1" == "1" ]]; then
exit 0
fi

VERSION="3.5.2"
VERSION="3.5.3"
INSTALL_DIR="${RPM_INSTALL_PREFIX}/ropen/${VERSION}"
DIRECTORY="${INSTALL_DIR}/lib64/R"
if [ -e "${INSTALL_DIR}/MKL_EULA.txt" ]; then
Expand Down
2 changes: 1 addition & 1 deletion setup-MRO/packageScripts/mro/rpm/prerm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

VERSION=3.5.2
VERSION=3.5.3
INSTALL_PREFIX="${RPM_INSTALL_PREFIX}/ropen/${VERSION}"

for file in R Rscript
Expand Down
4 changes: 2 additions & 2 deletions source/SVN-REVISION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Revision: 75870
Last Changed Date: 2018-12-20
Revision: 76217
Last Changed Date: 2019-03-11
2 changes: 1 addition & 1 deletion source/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.5.2
3.5.3
2 changes: 1 addition & 1 deletion source/VERSION-NICK
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Eggshell Igloo
Great Truth
Loading