Skip to content
This repository has been archived by the owner on Sep 18, 2024. It is now read-only.

Fix the issue that date nanoseconds does not work under macOS #1434

Merged
merged 12 commits into from
Aug 12, 2019
Merged

Fix the issue that date nanoseconds does not work under macOS #1434

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ebff677
Eject from react-scripts-ts-antd and bump webui dependencies version …
liuzhe-lz Aug 7, 2019
f721b43
Try to fix security alert (#1429)
liuzhe-lz Aug 7, 2019
ff28e1b
Fix the issue that date nanoseconds does not work under macOS
ultmaster Aug 7, 2019
0b1f74e
Use === instead of == when checking platform
Aug 9, 2019
d7ed169
Merge branch 'v1.0' into fix-macos-clock
Aug 12, 2019
eaf4212
squash commits in v1.0 first round bug bash
suiguoxin Aug 12, 2019
2a7881e
fix bug when duplicated final results (#1456)
QuanluZhang Aug 12, 2019
d754574
update doc-rename download (#1457)
lvybriage Aug 12, 2019
13bec75
fix bugs, sort, concurrency, multi (#1451)
lvybriage Aug 12, 2019
ec40e59
change authFile to local path (#1455)
SparkSnail Aug 12, 2019
0f22aaa
fix broken links in generalNasInterface doc (#1454)
QuanluZhang Aug 12, 2019
f97f5af
Merge branch 'v1.0' into fix-macos-clock
Aug 12, 2019
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
11 changes: 8 additions & 3 deletions src/nni_manager/training_service/local/localTrainingService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,9 +521,14 @@ class LocalTrainingService implements TrainingService {
`$NOW_DATE = "$NOW_DATE" + (Get-Date -Format fff).ToString()`,
`Write $LASTEXITCODE " " $NOW_DATE | Out-File ${path.join(workingDirectory, '.nni', 'state')} -NoNewline -encoding utf8`);
} else {
script.push(
`eval ${localTrailConfig.command} 2>${path.join(workingDirectory, 'stderr')}`,
`echo $? \`date +%s%3N\` >${path.join(workingDirectory, '.nni', 'state')}`);
script.push(`eval ${localTrailConfig.command} 2>${path.join(workingDirectory, 'stderr')}`);
if (process.platform == 'darwin') {
Copy link
Contributor

Choose a reason for hiding this comment

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

Better to use "===" instead of "=="

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

// https://superuser.com/questions/599072/how-to-get-bash-execution-time-in-milliseconds-under-mac-os-x
// Considering the worst case, write 999 to avoid negative duration
script.push(`echo $? \`date +%s999\` >${path.join(workingDirectory, '.nni', 'state')}`);
} else {
script.push(`echo $? \`date +%s%3N\` >${path.join(workingDirectory, '.nni', 'state')}`);
}
}

return script;
Expand Down