Skip to content

GitLab

Commit b554fe80 authored by goooxu's avatar goooxu Committed by fishyds
Browse files

Add yarn tslint command (#518)

parent 1bc23f4f
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 43 deletions
Makefile
View file @ b554fe80
...@@ -46,7 +46,8 @@ NNI_YARN_FOLDER ?= /tmp/nni-yarn ...@@ -46,7 +46,8 @@ NNI_YARN_FOLDER ?= /tmp/nni-yarn
NNI_YARN := PATH=$(BIN_FOLDER):$${PATH} $(NNI_YARN_FOLDER)/bin/yarn NNI_YARN := PATH=$(BIN_FOLDER):$${PATH} $(NNI_YARN_FOLDER)/bin/yarn
## Version number ## Version number
NNI_VERSION = $(shell git describe --tags) NNI_VERSION_VALUE = $(shell git describe --tags)
NNI_VERSION_TEMPLATE = 999.0.0-developing
# Main targets # Main targets
...@@ -160,18 +161,18 @@ install-dependencies: $(NNI_NODE_TARBALL) $(NNI_YARN_TARBALL) ...@@ -160,18 +161,18 @@ install-dependencies: $(NNI_NODE_TARBALL) $(NNI_YARN_TARBALL)
.PHONY: install-python-modules .PHONY: install-python-modules
install-python-modules: install-python-modules:
#$(_INFO) Installing Python SDK $(_END) #$(_INFO) Installing Python SDK $(_END)
cd src/sdk/pynni && sed -ie 's/NNI_VERSION/$(NNI_VERSION)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) . cd src/sdk/pynni && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) .
#$(_INFO) Installing nnictl $(_END) #$(_INFO) Installing nnictl $(_END)
cd tools && sed -ie 's/NNI_VERSION/$(NNI_VERSION)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) . cd tools && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) .
.PHONY: dev-install-python-modules .PHONY: dev-install-python-modules
dev-install-python-modules: dev-install-python-modules:
#$(_INFO) Installing Python SDK $(_END) #$(_INFO) Installing Python SDK $(_END)
cd src/sdk/pynni && sed -ie 's/NNI_VERSION/$(NNI_VERSION)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) -e . cd src/sdk/pynni && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) -e .
#$(_INFO) Installing nnictl $(_END) #$(_INFO) Installing nnictl $(_END)
cd tools && sed -ie 's/NNI_VERSION/$(NNI_VERSION)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) -e . cd tools && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) -e .
.PHONY: install-node-modules .PHONY: install-node-modules
install-node-modules: install-node-modules:
...@@ -179,7 +180,7 @@ install-node-modules: ...@@ -179,7 +180,7 @@ install-node-modules:
rm -rf $(NNI_PKG_FOLDER) rm -rf $(NNI_PKG_FOLDER)
cp -r src/nni_manager/dist $(NNI_PKG_FOLDER) cp -r src/nni_manager/dist $(NNI_PKG_FOLDER)
cp src/nni_manager/package.json $(NNI_PKG_FOLDER) cp src/nni_manager/package.json $(NNI_PKG_FOLDER)
sed -ie 's/NNI_VERSION/$(NNI_VERSION)/' $(NNI_PKG_FOLDER)/package.json sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' $(NNI_PKG_FOLDER)/package.json
$(NNI_YARN) --prod --cwd $(NNI_PKG_FOLDER) $(NNI_YARN) --prod --cwd $(NNI_PKG_FOLDER)
cp -r src/webui/build $(NNI_PKG_FOLDER)/static cp -r src/webui/build $(NNI_PKG_FOLDER)/static
...@@ -189,7 +190,7 @@ dev-install-node-modules: ...@@ -189,7 +190,7 @@ dev-install-node-modules:
rm -rf $(NNI_PKG_FOLDER) rm -rf $(NNI_PKG_FOLDER)
ln -sf ${PWD}/src/nni_manager/dist $(NNI_PKG_FOLDER) ln -sf ${PWD}/src/nni_manager/dist $(NNI_PKG_FOLDER)
cp src/nni_manager/package.json $(NNI_PKG_FOLDER) cp src/nni_manager/package.json $(NNI_PKG_FOLDER)
sed -ie 's/NNI_VERSION/$(NNI_VERSION)/' $(NNI_PKG_FOLDER)/package.json sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' $(NNI_PKG_FOLDER)/package.json
ln -sf ${PWD}/src/nni_manager/node_modules $(NNI_PKG_FOLDER)/node_modules ln -sf ${PWD}/src/nni_manager/node_modules $(NNI_PKG_FOLDER)/node_modules
ln -sf ${PWD}/src/webui/build $(NNI_PKG_FOLDER)/static ln -sf ${PWD}/src/webui/build $(NNI_PKG_FOLDER)/static
......
deployment/pypi/Makefile
View file @ b554fe80
...@@ -11,7 +11,8 @@ else ...@@ -11,7 +11,8 @@ else
$(error platform $(UNAME_S) not supported) $(error platform $(UNAME_S) not supported)
endif endif
NNI_VERSION = $(shell git describe --tags) NNI_VERSION_VALUE = $(shell git describe --tags)
NNI_VERSION_TEMPLATE = 999.0.0-developing
.PHONY: build .PHONY: build
build: build:
...@@ -26,10 +27,10 @@ build: ...@@ -26,10 +27,10 @@ build:
cp -r $(CWD)../../src/nni_manager/dist $(CWD)nni cp -r $(CWD)../../src/nni_manager/dist $(CWD)nni
cp -r $(CWD)../../src/webui/build $(CWD)nni/static cp -r $(CWD)../../src/webui/build $(CWD)nni/static
cp $(CWD)../../src/nni_manager/package.json $(CWD)nni cp $(CWD)../../src/nni_manager/package.json $(CWD)nni
sed -ie 's/NNI_VERSION/$(NNI_VERSION)/' $(CWD)nni/package.json sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' $(CWD)nni/package.json
cd $(CWD)nni && yarn --prod cd $(CWD)nni && yarn --prod
cd $(CWD) && sed -ie 's/NNI_VERSION/$(NNI_VERSION)/' setup.py && python3 setup.py bdist_wheel -p $(WHEEL_SPEC) cd $(CWD) && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && python3 setup.py bdist_wheel -p $(WHEEL_SPEC)
cd $(CWD)../../src/sdk/pynni && sed -ie 's/NNI_VERSION/$(NNI_VERSION)/' setup.py && python3 setup.py bdist_wheel cd $(CWD)../../src/sdk/pynni && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && python3 setup.py bdist_wheel
cp -r $(CWD)../../src/sdk/pynni/dist/*.whl $(CWD)dist cp -r $(CWD)../../src/sdk/pynni/dist/*.whl $(CWD)dist
cd $(CWD) cd $(CWD)
......
deployment/pypi/setup.py
View file @ b554fe80
...@@ -20,7 +20,7 @@ with open('../../README.md', 'r') as fh: ...@@ -20,7 +20,7 @@ with open('../../README.md', 'r') as fh:
setuptools.setup( setuptools.setup(
name = 'nni', name = 'nni',
version = 'NNI_VERSION', version = '999.0.0-developing',
author = 'Microsoft NNI team', author = 'Microsoft NNI team',
author_email = 'nni@microsoft.com', author_email = 'nni@microsoft.com',
description = 'Neural Network Intelligence package', description = 'Neural Network Intelligence package',
......
setup.py
View file @ b554fe80
...@@ -35,7 +35,7 @@ class CustomInstallCommand(install): ...@@ -35,7 +35,7 @@ class CustomInstallCommand(install):
setup( setup(
name = 'nni', name = 'nni',
version = 'NNI_VERSION', version = '999.0.0-developing',
author = 'Microsoft NNI Team', author = 'Microsoft NNI Team',
author_email = 'nni@microsoft.com', author_email = 'nni@microsoft.com',
description = 'Neural Network Intelligence project', description = 'Neural Network Intelligence project',
......
src/nni_manager/common/log.ts
View file @ b554fe80
...@@ -120,7 +120,7 @@ class Logger { ...@@ -120,7 +120,7 @@ class Logger {
private log(level: string, param: any[]): void { private log(level: string, param: any[]): void {
const buffer: WritableStreamBuffer = new WritableStreamBuffer(); const buffer: WritableStreamBuffer = new WritableStreamBuffer();
buffer.write(`[${(new Date()).toISOString()}] ${level} `); buffer.write(`[${(new Date()).toISOString()}] ${level} `);
buffer.write(format.apply(null, param)); buffer.write(format(null, param));
buffer.write('\n'); buffer.write('\n');
buffer.end(); buffer.end();
this.bufferSerialEmitter.feed(buffer.getContents()); this.bufferSerialEmitter.feed(buffer.getContents());
......
src/nni_manager/core/nnimanager.ts
View file @ b554fe80
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
import * as assert from 'assert'; import * as assert from 'assert';
import * as cpp from 'child-process-promise'; import * as cpp from 'child-process-promise';
import { ChildProcess, spawn } from 'child_process'; import { ChildProcess, spawn, StdioOptions } from 'child_process';
import { Deferred } from 'ts-deferred'; import { Deferred } from 'ts-deferred';
import * as component from '../common/component'; import * as component from '../common/component';
import { DataStore, MetricDataRecord, MetricType, TrialJobInfo } from '../common/datastore'; import { DataStore, MetricDataRecord, MetricType, TrialJobInfo } from '../common/datastore';
...@@ -35,7 +35,7 @@ import { ...@@ -35,7 +35,7 @@ import {
import { import {
TrainingService, TrialJobApplicationForm, TrialJobDetail, TrialJobMetric, TrialJobStatus TrainingService, TrialJobApplicationForm, TrialJobDetail, TrialJobMetric, TrialJobStatus
} from '../common/trainingService'; } from '../common/trainingService';
import { delay , getLogDir, getCheckpointDir, getMsgDispatcherCommand, mkDirP} from '../common/utils'; import { delay, getLogDir, getCheckpointDir, getMsgDispatcherCommand, mkDirP } from '../common/utils';
import { import {
ADD_CUSTOMIZED_TRIAL_JOB, INITIALIZE, INITIALIZED, KILL_TRIAL_JOB, NEW_TRIAL_JOB, NO_MORE_TRIAL_JOBS, ADD_CUSTOMIZED_TRIAL_JOB, INITIALIZE, INITIALIZED, KILL_TRIAL_JOB, NEW_TRIAL_JOB, NO_MORE_TRIAL_JOBS,
REPORT_METRIC_DATA, REQUEST_TRIAL_JOBS, SEND_TRIAL_JOB_PARAMETER, TERMINATE, TRIAL_END, UPDATE_SEARCH_SPACE REPORT_METRIC_DATA, REQUEST_TRIAL_JOBS, SEND_TRIAL_JOB_PARAMETER, TERMINATE, TRIAL_END, UPDATE_SEARCH_SPACE
...@@ -253,7 +253,7 @@ class NNIManager implements Manager { ...@@ -253,7 +253,7 @@ class NNIManager implements Manager {
if (this.dispatcher !== undefined) { if (this.dispatcher !== undefined) {
return; return;
} }
const stdio: (string | NodeJS.WriteStream)[] = ['ignore', process.stdout, process.stderr, 'pipe', 'pipe']; const stdio: StdioOptions = ['ignore', process.stdout, process.stderr, 'pipe', 'pipe'];
let newCwd: string; let newCwd: string;
if (cwd === undefined || cwd === '') { if (cwd === undefined || cwd === '') {
newCwd = getLogDir(); newCwd = getLogDir();
...@@ -387,7 +387,8 @@ class NNIManager implements Manager { ...@@ -387,7 +387,8 @@ class NNIManager implements Manager {
this.dispatcher.sendCommand(TRIAL_END, JSON.stringify({ this.dispatcher.sendCommand(TRIAL_END, JSON.stringify({
trial_job_id: trialJobDetail.id, trial_job_id: trialJobDetail.id,
event: trialJobDetail.status, event: trialJobDetail.status,
hyper_params: hyperParams })); hyper_params: hyperParams
}));
break; break;
case 'FAILED': case 'FAILED':
case 'SYS_CANCELED': case 'SYS_CANCELED':
...@@ -403,7 +404,8 @@ class NNIManager implements Manager { ...@@ -403,7 +404,8 @@ class NNIManager implements Manager {
this.dispatcher.sendCommand(TRIAL_END, JSON.stringify({ this.dispatcher.sendCommand(TRIAL_END, JSON.stringify({
trial_job_id: trialJobDetail.id, trial_job_id: trialJobDetail.id,
event: trialJobDetail.status, event: trialJobDetail.status,
hyper_params: hyperParams})); hyper_params: hyperParams
}));
break; break;
case 'WAITING': case 'WAITING':
case 'RUNNING': case 'RUNNING':
......
src/nni_manager/core/test/ipcInterface.test.ts
View file @ b554fe80
...@@ -20,15 +20,15 @@ ...@@ -20,15 +20,15 @@
'use strict'; 'use strict';
import * as assert from 'assert'; import * as assert from 'assert';
import { ChildProcess, spawn } from 'child_process'; import { ChildProcess, spawn, StdioOptions } from 'child_process';
import { Deferred } from 'ts-deferred'; import { Deferred } from 'ts-deferred';
import { cleanupUnitTest, prepareUnitTest } from '../../common/utils'; import { cleanupUnitTest, prepareUnitTest } from '../../common/utils';
import * as CommandType from '../commands'; import * as CommandType from '../commands';
import { createDispatcherInterface, IpcInterface } from '../ipcInterface'; import { createDispatcherInterface, IpcInterface } from '../ipcInterface';
import { NNIError } from '../../common/errors'; import { NNIError } from '../../common/errors';
let sentCommands: {[key: string]: string}[] = []; let sentCommands: { [key: string]: string }[] = [];
const receivedCommands: {[key: string]: string}[] = []; const receivedCommands: { [key: string]: string }[] = [];
let commandTooLong: Error | undefined; let commandTooLong: Error | undefined;
let rejectCommandType: Error | undefined; let rejectCommandType: Error | undefined;
...@@ -38,7 +38,7 @@ function runProcess(): Promise<Error | null> { ...@@ -38,7 +38,7 @@ function runProcess(): Promise<Error | null> {
const deferred: Deferred<Error | null> = new Deferred<Error | null>(); const deferred: Deferred<Error | null> = new Deferred<Error | null>();
// create fake assessor process // create fake assessor process
const stdio: {}[] = ['ignore', 'pipe', process.stderr, 'pipe', 'pipe']; const stdio: StdioOptions = ['ignore', 'pipe', process.stderr, 'pipe', 'pipe'];
const proc: ChildProcess = spawn('python3 assessor.py', [], { stdio, cwd: 'core/test', shell: true }); const proc: ChildProcess = spawn('python3 assessor.py', [], { stdio, cwd: 'core/test', shell: true });
// record its sent/received commands on exit // record its sent/received commands on exit
......
src/nni_manager/core/test/ipcInterfaceTerminate.test.ts
View file @ b554fe80
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
'use strict'; 'use strict';
import * as assert from 'assert'; import * as assert from 'assert';
import { ChildProcess, spawn } from 'child_process'; import { ChildProcess, spawn, StdioOptions } from 'child_process';
import { Deferred } from 'ts-deferred'; import { Deferred } from 'ts-deferred';
import { cleanupUnitTest, prepareUnitTest, getMsgDispatcherCommand } from '../../common/utils'; import { cleanupUnitTest, prepareUnitTest, getMsgDispatcherCommand } from '../../common/utils';
import * as CommandType from '../commands'; import * as CommandType from '../commands';
...@@ -32,9 +32,9 @@ let procError: boolean = false; ...@@ -32,9 +32,9 @@ let procError: boolean = false;
function startProcess(): void { function startProcess(): void {
// create fake assessor process // create fake assessor process
const stdio: {}[] = ['ignore', 'pipe', process.stderr, 'pipe', 'pipe']; const stdio: StdioOptions = ['ignore', 'pipe', process.stderr, 'pipe', 'pipe'];
const dispatcherCmd : string = getMsgDispatcherCommand( const dispatcherCmd: string = getMsgDispatcherCommand(
// Mock tuner config // Mock tuner config
{ {
className: 'DummyTuner', className: 'DummyTuner',
......
src/nni_manager/package.json
View file @ b554fe80
{ {
"name": "nni", "name": "nni",
"version": "NNI_VERSION", "version": "999.0.0-developing",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"postbuild": "cp -rf scripts ./dist/ && cp -rf config ./dist/", "postbuild": "cp -rf scripts ./dist/ && cp -rf config ./dist/",
"build": "tsc", "build": "tsc",
"test": "mocha -r ts-node/register -t 15000 --recursive **/*.test.ts --exclude node_modules/**/**/*.test.ts --colors", "test": "mocha -r ts-node/register -t 15000 --recursive **/*.test.ts --exclude node_modules/**/**/*.test.ts --colors",
"start": "node dist/main.js" "start": "node dist/main.js",
"tslint": "tslint -p ."
}, },
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
...@@ -24,7 +25,7 @@ ...@@ -24,7 +25,7 @@
"ts-deferred": "^1.0.4", "ts-deferred": "^1.0.4",
"typescript-ioc": "^1.2.4", "typescript-ioc": "^1.2.4",
"typescript-string-operations": "^1.3.1", "typescript-string-operations": "^1.3.1",
"webhdfs":"^1.2.0", "webhdfs": "^1.2.0",
"azure-storage": "^2.10.2", "azure-storage": "^2.10.2",
"kubernetes-client": "^6.5.0", "kubernetes-client": "^6.5.0",
"js-base64": "^2.4.9" "js-base64": "^2.4.9"
...@@ -34,7 +35,7 @@ ...@@ -34,7 +35,7 @@
"@types/chai-as-promised": "^7.1.0", "@types/chai-as-promised": "^7.1.0",
"@types/express": "^4.16.0", "@types/express": "^4.16.0",
"@types/mocha": "^5.2.5", "@types/mocha": "^5.2.5",
"@types/node": "^10.5.5", "@types/node": "^10.12.18",
"@types/request": "^2.47.1", "@types/request": "^2.47.1",
"@types/rx": "^4.1.1", "@types/rx": "^4.1.1",
"@types/sqlite3": "^3.1.3", "@types/sqlite3": "^3.1.3",
...@@ -47,9 +48,9 @@ ...@@ -47,9 +48,9 @@
"rmdir": "^1.2.0", "rmdir": "^1.2.0",
"tmp": "^0.0.33", "tmp": "^0.0.33",
"ts-node": "^7.0.0", "ts-node": "^7.0.0",
"tslint": "^5.11.0", "tslint": "^5.12.0",
"tslint-microsoft-contrib": "^5.1.0", "tslint-microsoft-contrib": "^6.0.0",
"typescript": "^3.0.1" "typescript": "^3.2.2"
}, },
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"
......
src/sdk/pynni/setup.py
View file @ b554fe80
...@@ -27,7 +27,7 @@ def read(fname): ...@@ -27,7 +27,7 @@ def read(fname):
setuptools.setup( setuptools.setup(
name = 'nni-sdk', name = 'nni-sdk',
version = 'NNI_VERSION', version = '999.0.0-developing',
packages = setuptools.find_packages(exclude=['tests']), packages = setuptools.find_packages(exclude=['tests']),
python_requires = '>=3.5', python_requires = '>=3.5',
......
tools/setup.py
View file @ b554fe80
...@@ -2,7 +2,7 @@ import setuptools ...@@ -2,7 +2,7 @@ import setuptools
setuptools.setup( setuptools.setup(
name = 'nnictl', name = 'nnictl',
version = 'NNI_VERSION', version = '999.0.0-developing',
packages = setuptools.find_packages(exclude=['*test*']), packages = setuptools.find_packages(exclude=['*test*']),
python_requires = '>=3.5', python_requires = '>=3.5',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment