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

Revert "Selectively install through pip (#139)" due to potential pip install issue #142

Merged
merged 3 commits into from
Sep 29, 2018
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ To learn more about how this example was constructed and how to analyze the expe
* [Tuners supported by NNI.](src/sdk/pynni/nni/README.md)
* [How to enable early stop (i.e. assessor) in an experiment?](docs/EnableAssessor.md)
* [How to run an experiment on multiple machines?](docs/RemoteMachineMode.md)
* [How to run an experiment on OpenPAI?](docs/PAIMode.md)
* [How to write a customized tuner?](docs/CustomizedTuner.md)
* [How to write a customized assessor?](examples/assessors/README.md)
* [How to resume an experiment?](docs/NNICTLDOC.md)
Expand Down
41 changes: 13 additions & 28 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,35 +29,9 @@ def read(fname):

class CustomInstallCommand(install):
'''a customized install class in pip module'''
user_options = install.user_options + [
('sdk-only', None, '<add --sdk-only if you want to only install nni sdk')
]

def initialize_options(self):
install.initialize_options(self)
self.sdk_only = None

def install_requires(self):
self.install_requires_list = [
'astor',
'hyperopt',
'json_tricks',
'numpy',
'psutil',
'pyyaml',
'requests',
'scipy',
'schema',
'pyhdfs'
]
for pkg in self.install_requires_list:
subprocess.run(['python3', '-m', 'pip', 'install', pkg], check=True)

def run(self):
super().run()
if self.sdk_only is None:
subprocess.run(['make', 'pip-install'], check=True)
self.install_requires()
subprocess.run(['make', 'pip-install'], check=True)

setup(
name = 'NNI',
Expand All @@ -78,7 +52,18 @@ def run(self):
},
package_data = {'nni': ['**/requirements.txt']},
python_requires = '>=3.5',

install_requires = [
'astor',
'hyperopt',
'json_tricks',
'numpy',
'psutil',
'pyyaml',
'requests',
'scipy',
'schema',
'pyhdfs'
],

cmdclass={
'install': CustomInstallCommand
Expand Down
3 changes: 3 additions & 0 deletions tools/trial_tool/trial_keeper.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ def main_loop(args):
print('copy directory failed!')
except Exception as exception:
print(exception)

## Exit as the retCode of subprocess(trial)
exit(retCode)
break
else:
print('subprocess pid: {} is still alive'.format(process.pid))
Expand Down