Sorry, wrong command. git reset --hard origin/master
Sent from my MegaPhone > On Sep 14, 2015, at 8:58 PM, 付亚静 <[email protected]> wrote: > > Hi > Matt Taylor > That's very kind of you and thank you for your detailed explanation. But I > can't hard reset. > > abc@abc-VirtualBox:/newdisk/nupic$ git reset --hard origin master > fatal: Cannot do hard reset with paths. > > abc@abc-VirtualBox:/newdisk/nupic$ python --version > Python 2.7.3 > > abc@abc-VirtualBox:/newdisk/nupic$ pip --version > pip 1.0 from /usr/lib/python2.7/dist-packages (python 2.7) > > abc@abc-VirtualBox:/newdisk/nupic$ gcc --version > gcc (Ubuntu 4.8.1-2ubuntu1~12.04) 4.8.1 > Copyright (C) 2013 Free Software Foundation, Inc. > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > > abc@abc-VirtualBox:/newdisk/nupic$ cat /etc/issue > Ubuntu 12.04.5 LTS \n \l > > I'm confused with so many git commands and not sure what's the meaning of > "checked out" in "assuming $NUPIC is where you have it checked out". Some > info about my nupic are showed as follows: > > abc@abc-VirtualBox:/newdisk/nupic$ git branch -a > * master > remotes/origin/HEAD -> origin/master > remotes/origin/add-nupic-linux64-back > remotes/origin/add_capnp_to_SPRegion > remotes/origin/core-update-09190c1b465a0ef5268cfb40ea03194fd1ee06a5 > remotes/origin/core-update-09f8350ef49aa2404a3aaab32200d99793fb17c4 > remotes/origin/core-update-0a891f27d137825e1d29870cb2a2df7ac33f5b65 > remotes/origin/core-update-0c815c2b84d92d0ca1a81beca2bed7e3d3ce6776 > remotes/origin/core-update-0d5eb8452229a42352e77c69f4300165c3d6f834 > remotes/origin/core-update-140a176ef1f53bb5014e60cec5a26ecc0498d23e > remotes/origin/core-update-241986490135472f5b2a33fc54de41ff3fc90871 > remotes/origin/core-update-26f27da204948ad6858a722627acf700722de195 > remotes/origin/core-update-3b6eeb2af09b8e1f4def918c98b013fe49acea46 > remotes/origin/core-update-3ee66ab918b3673e347f6cd38d92f3498c0a835e > remotes/origin/core-update-412871e85dec5a195f7f59c01ca87100bfd5f346 > remotes/origin/core-update-42d66a13dffc2647ea852ed4d2632f751b66ecf4 > remotes/origin/core-update-4ef1f6e560af555f1f53f457d0400dc4c3a67658 > remotes/origin/core-update-504f3616c52d3809bc056da1726aefc4d1cdacb7 > remotes/origin/core-update-54faae374b409b8874feeeec40b2644eec6cddc1 > remotes/origin/core-update-603ee4b04b3c2b8d444b0b98aef7ff1cfaa4d6c6 > remotes/origin/core-update-60a82001f0f8a6ed2a8097571653bfe0f1976683 > remotes/origin/core-update-633368e394c3de72e93e401efcd8e91ec30abf53 > remotes/origin/core-update-6485cd327fbdcf3bb6d15260468ff5e1da5f9753 > remotes/origin/core-update-66de57d6294575ad36343a8ab8d1e0697e1789dc > remotes/origin/core-update-6729b0a634b3fa74b76fd7065ea0c426b33a0808 > remotes/origin/core-update-69af1b6750198c7b37d974b161bdd0c425fc0a2c > remotes/origin/core-update-6d83da85e1375cb0bc961dc79e95b3269f6ff4ae > remotes/origin/core-update-701eb9a1b57f7da33a3a84f800982915a628c6af > remotes/origin/core-update-706b5682b35e0f78ce1a36c0e7100d109b04ed54 > remotes/origin/core-update-72da8988209e95845bead91b7a91e1312939dd78 > remotes/origin/core-update-7618a54a7f0e7530da5d1f5e4e5a053675d6ad5c > remotes/origin/core-update-78fb04c13f6255cc491a28ac296b9b50c252913a > remotes/origin/core-update-7b51f6c24659b732584b51bc61e85ff34eef4d53 > remotes/origin/core-update-7b9742fa4494dde6a716da0a84fcf791dbcab2b7 > remotes/origin/core-update-82b9a97937b17d9a2c32e9d89bca6e1fe1eea923 > remotes/origin/core-update-908600dc1e8f35a2a5c848e0af2e708948886aeb > remotes/origin/core-update-917f48c0de7c47359c92487db7c4967020140a45 > remotes/origin/core-update-9218471fcdba9ea87b7f372d92d217d9553817a7 > remotes/origin/core-update-a13e5de360287a8c4b63675ca170b9d4556eaedf > remotes/origin/core-update-a23a6df1aff8e475ec6995d8b6f48cae83e8dbb4 > remotes/origin/core-update-a25068f00bde589f029e0cfc94ac3343bfaa9254 > remotes/origin/core-update-a5b35e6619dbfe1130dc4785bf92d7df3fba6cb5 > remotes/origin/core-update-ad25c77d3e30f1029816aabf17ea4d387fff3ea3 > remotes/origin/core-update-b4bdca9627857a5076f7e40f46cba1efa3284872 > remotes/origin/core-update-b70bfd70f9fd7176c160a775533e3b0523d1db7e > remotes/origin/core-update-b71a593077f5e49c780b0002629b5e8966f61b36 > remotes/origin/core-update-bc25849db6815d379afb5b539e27c8565e6417f0 > remotes/origin/core-update-c6f634cabfba545545faa0ef901a566f7a7fd70e > remotes/origin/core-update-cb55ebd9633923040176db0c041945f190d69800 > remotes/origin/core-update-cca41015071df968ba79ab7b9625f68de2cd4e1d > remotes/origin/core-update-d41566a1b1448dcdd3b1a846ce14d18b63be2f18 > remotes/origin/core-update-da34067f70ffcd71aa56781fe0e4aa1ced81ff79 > remotes/origin/core-update-de7052fa535cb55ba97d6dd37950d9aab998b35c > remotes/origin/core-update-eb0b420973f54536debd9d13334a88cdc05bf5c1 > remotes/origin/core-update-f413775712bed847fb94e2abb9c20c546fb4d44c > remotes/origin/core-update-f55119a2f255fa4961b9c44ecb5261076bb4db0a > remotes/origin/core-update-fd7757d57fe4ba873156963f961567a5a6f42f43 > remotes/origin/core-update-ffb81006c38ac9c1bdd2c161c91211d556ec1805 > remotes/origin/master > remotes/origin/revert-1482-scalar-space-encoder > > > abc@abc-VirtualBox:/newdisk/nupic$ git status > # On branch master > # Your branch is ahead of 'origin/master' by 2 commits. > # > # Untracked files: > # (use "git add <file>..." to include in what will be committed) > # > # bin/ > # examples/AD_fyj/ > # examples/fyj/ > # examples/network/hierarchy-demo-output.csv > # examples/network/network-demo-output.csv > # examples/network/test_output.csv > # examples/opf/clients/hotgym/anomaly/anomaly_scores.csv > # examples/opf/clients/hotgym/anomaly/one_gym/rec-center-hourly_out.csv > # > examples/opf/clients/hotgym/prediction/one_gym/model_params/rec_center_hourly_model_params.py > # examples/opf/clients/hotgym/prediction/one_gym/swarm/ > # fake-extension.so > # nupic/bindings/_algorithms.so > # nupic/bindings/_engine_internal.so > # nupic/bindings/_math.so > # nupic/bindings/algorithms.py > # nupic/bindings/algorithms_wrap.cxx > # nupic/bindings/engine_internal.py > # nupic/bindings/engine_internal_wrap.cxx > # nupic/bindings/math.py > # nupic/bindings/math_wrap.cxx > # nupic/bindings/proto/BitHistory.capnp > # nupic/bindings/proto/ClaClassifier.capnp > # nupic/bindings/proto/ConnectionsProto.capnp > # nupic/bindings/proto/RandomProto.capnp > # nupic/bindings/proto/SparseBinaryMatrixProto.capnp > # nupic/bindings/proto/SparseMatrixProto.capnp > # nupic/bindings/proto/SpatialPoolerProto.capnp > # nupic/libcpp_region.so > nothing added to commit but untracked files present (use "git add" to track) > > Yajingfu > ------------------ 原始邮件 ------------------ > 发件人: "Matthew Taylor";<[email protected]>; > 发送时间: 2015年9月15日(星期二) 凌晨0:57 > 收件人: "付亚静"<[email protected]>; > 主题: Re: 回复： How to update the newest NuPIC version > > Yajingfu, > > Try this, so we can start from scratch. These git commands will ensure > that your working directory is up to date and clean (this will destroy > any local changes you have not committed): > > cd $NUPIC # assuming $NUPIC is where you have it checked out > git fetch origin > git reset --hard origin master > git clean -dfx > > Now again make sure everything is uninstalled: > > pip uninstall nupic -y > pip uninstall nupic.bindings -y > > Run those two commands a few times until they tell you nothing is > installed. Then try to install from scratch: > > python setup.py install > > You may need to add the "--user" option for the command above if you > have permission issues. > > If this does not work, please tell us some extra info: > - python version > - pip version > - OS details (Linux flavor?) > - gcc version > > I hope that helps, > > > > --------- > Matt Taylor > OS Community Flag-Bearer > Numenta > > > On Sun, Sep 13, 2015 at 7:19 PM, 付亚静 <[email protected]> wrote: > > Hi NuPIC > > I wonder what else I can do for the problem. Can anyone help me? Thank > > you so much！ > > > > Yajingfu > > > > > > ------------------ 原始邮件 ------------------ > > 发件人: "付亚静";<[email protected]>; > > 发送时间: 2015年9月11日(星期五) 晚上11:16 > > 收件人: "付亚静"<[email protected]>; > > 主题: 回复： 回复： How to update the newest NuPIC version > > > > Hi > > > > I tried the two commands and had some version conflict. For > > example，VersionConflict: (pytest 2.7.2 > > (/usr/local/lib/python2.7/dist-packages), > > Requirement.parse('pytest==2.4.2'))。 > > > > so I reinstalled them and it shows like this: > > > > abc@abc-VirtualBox:/newdisk$ pip uninstall nupic -y > > Uninstalling nupic: > > Successfully uninstalled nupic > > abc@abc-VirtualBox:/newdisk$ pip uninstall nupic.bindings -y > > Cannot uninstall requirement nupic.bindings, not installed > > Storing complete log in /home/abc/.pip/pip.log > > > > but it still has the same problem: > > > > abc@abc-VirtualBox:/newdisk/nupic$ python setup.py build > > error in nupic setup command: 'install_requires' must be a string or list of > > strings containing valid project/version requirement specifiers > > > > What should I do next? > > > > ------------------ 原始邮件 ------------------ > > 发件人: "Matthew Taylor";<[email protected]>; > > 发送时间: 2015年9月11日(星期五) 晚上10:33 > > 收件人: "付亚静"<[email protected]>; > > 主题: Re: 回复： How to update the newest NuPIC version > > > > Try uninstalling any old versions of nupic: > > https://github.com/numenta/nupic/wiki/Build-and-Installation-FAQ#im-having-trouble-updating-to-a-newer-version-of-nupic > > > > Then run "python setup.py build" again? > > --------- > > Matt Taylor > > OS Community Flag-Bearer > > Numenta > > > > > > On Fri, Sep 11, 2015 at 2:38 AM, 付亚静 <[email protected]> wrote: > >> > >> HI > >> > >> I took a snapshot before. So I recovered it and installed numpy 1.9.2 and > >> py.test at first successfully. Then I pulled and get the newest version. > >> But it can't be build seccufully. > >> > >> My steps are as follows. > >> > >>>>git commit -a > >>>>git pull > >> remote: Counting objects: 4, done. > >> remote: Compressing objects: 100% (4/4), done. > >> remote: Total 4 (delta 0), reused 0 (delta 0), pack-reused 0 > >> Unpacking objects: 100% (4/4), done. > >> From https://github.com/numenta/nupic > >> f2f1824..e6362c7 master -> origin/master > >> * [new branch] core-update-4ef1f6e560af555f1f53f457d0400dc4c3a67658 > >> -> > >> origin/core-update-4ef1f6e560af555f1f53f457d0400dc4c3a67658 > >> Merge made by the 'recursive' strategy. > >> .nupic_modules | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >>>>python setup.py build > >> error in nupic setup command: 'install_requires' must be a string or list > >> of > >> strings containing valid project/version requirement specifiers > >> > >> It's too strange. I can't solve it. So asking for help. Thank you. :) > >> > >> ------------------ 原始邮件 ------------------ > >> 发件人: "Matthew Taylor";<[email protected]>; > >> 发送时间: 2015年9月10日(星期四) 晚上11:43 > >> 收件人: "付亚静"<[email protected]>; > >> 主题: Re: 回复： How to update the newest NuPIC version > >> > >> What does this show? > >> > >>> which pytest > >> > >> > >> --------- > >> Matt Taylor > >> OS Community Flag-Bearer > >> Numenta > >> > >> On Tue, Sep 8, 2015 at 9:24 PM, 付亚静 <[email protected]> wrote: > >>> > >>> > >>> I searched and found https://github.com/numenta/nupic/issues/2008 was > >>> similar to my problem. So I input command "sudo pip install -U pytest" > >>> depending on http://pytest.org/latest/getting-started.html just like > >>> this: > >>> > >>> abc@abc-VirtualBox:~$ sudo pip install -U pytest > >>> Downloading/unpacking pytest > >>> Running setup.py egg_info for package pytest > >>> > >>> Downloading/unpacking py>=1.4.29 (from pytest) > >>> Running setup.py egg_info for package py > >>> > >>> Installing collected packages: pytest, py > >>> Found existing installation: pytest 2.7.2 > >>> Uninstalling pytest: > >>> Successfully uninstalled pytest > >>> Running setup.py install for pytest > >>> > >>> Installing py.test script to /usr/local/bin > >>> Installing py.test-2.7 script to /usr/local/bin > >>> Found existing installation: py 1.4.30 > >>> Uninstalling py: > >>> Successfully uninstalled py > >>> Running setup.py install for py > >>> > >>> Successfully installed pytest py > >>> Cleaning up... > >>> > >>> then I tried to test wether pytest is installed correctly. > >>> > >>> abc@abc-VirtualBox:~$ py.test --version > >>> bash: /usr/bin/py.test: No such file or directory > >>> > >>> What should I do? Hoping for your reply. > >>> > >>> ------------------ 原始邮件 ------------------ > >>> 发件人: "付亚静";<[email protected]>; > >>> 发送时间: 2015年9月9日(星期三) 中午11:08 > >>> 收件人: "付亚静"<[email protected]>; > >>> 主题: 回复： 回复： How to update the newest NuPIC version > >>> > >>> I used "sudo pip install numpy --upgrage" and numpy 1.9.2 was installed > >>> successfully. > >>> Then I inputed commands: > >>> python setup.py build > >>> python setup.py install --user > >>> python setup.py develop --user > >>> The three commands showed above were all correct. > >>> Then I tried to test it. > >>> $NUPIC/bin/py_region_test > >>> --- ALL TESTS PASSED --- > >>> > >>> But all of the rest tests have the same error. > >>> abc@abc-VirtualBox:~$ $NUPIC/scripts/run_nupic_tests --all --coverage > >>> Traceback (most recent call last): > >>> File "/newdisk/nupic/scripts/run_nupic_tests", line 265, in <module> > >>> result = main(parser, sys.argv[1:]) > >>> File "/newdisk/nupic/scripts/run_nupic_tests", line 255, in main > >>> exitStatus = call(["py.test"] + args + list(tests)) > >>> File "/usr/lib/python2.7/subprocess.py", line 493, in call > >>> return Popen(*popenargs, **kwargs).wait() > >>> File "/usr/lib/python2.7/subprocess.py", line 679, in __init__ > >>> errread, errwrite) > >>> File "/usr/lib/python2.7/subprocess.py", line 1249, in _execute_child > >>> raise child_exception > >>> OSError: [Errno 2] No such file or directory > >>> > >>> my pytest version is 2.5.1. > >>> > >>> What should I do next? Thank you. > >>> > >>> > >>> ------------------ 原始邮件 ------------------ > >>> 发件人: "Matthew Taylor";<[email protected]>; > >>> 发送时间: 2015年9月8日(星期二) 晚上11:02 > >>> 收件人: "付亚静"<[email protected]>; > >>> 主题: Re: 回复： How to update the newest NuPIC version > >>> > >>> See > >>> > >>> https://github.com/numenta/nupic/wiki/Build-and-Installation-FAQ#missing-pythonh-file > >>> > >>> Sent from my MegaPhone > >>> > >>> On Sep 8, 2015, at 5:14 AM, 付亚静 <[email protected]> wrote: > >>> > >>> I tried "git pull" and my local files are the newest. But the code can't > >>> run. So I input command "python setup.py install --user" and get an error > >>> as > >>> follows. > >>> ... > >>> File > >>> > >>> "/tmp/easy_install-C80eUH/numpy-1.9.2/numpy/distutils/command/build_src.py", > >>> line 329, in build_extension_sources > >>> File > >>> > >>> "/tmp/easy_install-C80eUH/numpy-1.9.2/numpy/distutils/command/build_src.py", > >>> line 386, in generate_sources > >>> File "numpy/core/setup.py", line 432, in generate_config_h > >>> > >>> File "numpy/core/setup.py", line 42, in check_types > >>> > >>> File "numpy/core/setup.py", line 293, in check_types > >>> > >>> SystemError: Cannot compile 'Python.h'. Perhaps you need to install > >>> python-dev|python-devel. > >>> > >>> then I tried: > >>> abc@abc-VirtualBox:/newdisk/nupic$ sudo apt-get install python-dev > >>> Reading package lists... Done > >>> Building dependency tree > >>> Reading state information... Done > >>> python-dev is already the newest version. > >>> 0 upgraded, 0 newly installed, 0 to remove and 195 not upgraded. > >>> > >>> But it still has the same error. > >>> > >>> My OS is ubuntu 12.04, and I just want to update it. Should I just follow > >>> the commands of "installation" part > >>> > >>> (https://github.com/numenta/nupic/wiki/Installing-and-Building-NuPIC#installation)? > >>> > >>> > >>> ------------------ 原始邮件 ------------------ > >>> 发件人: "Richard Crowder";<[email protected]>; > >>> 发送时间: 2015年9月8日(星期二) 下午5:39 > >>> 收件人: "付亚静"<[email protected]>; > >>> 主题: Re: How to update the newest NuPIC version > >>> > >>> Hi, > >>> > >>> The usual route is via 'pip install nupic' (local or system wide). In you > >>> case, grabbing source from GitHub, could you try a 'git pull' to sync > >>> with > >>> the main repository (and then follow the Readme and Wiki steps for > >>> building > >>> and install). > >>> > >>> Regards, Richard. > >>> > >>> > >>> On Tue, Sep 8, 2015 at 10:31 AM, 付亚静 <[email protected]> wrote: > >>>> > >>>> Hi NuPIC: > >>>> I installed the NuPIC environment several monthes ago. And I > >>>> wanted > >>>> to update to the newest version. But I'm not familiar with git command. > >>>> I > >>>> tried to use the commands as follows. > >>>> > >>>> abc@abc-VirtualBox:/newdisk/nupic>Git stash > >>>> abc@abc-VirtualBox:/newdisk/nupic>Git fetch origin > >>>> abc@abc-VirtualBox:/newdisk/nupic>Git diff master origin/master > >>>> abc@abc-VirtualBox:/newdisk/nupic>Git stash pop > >>>> > >>>> The file nupic/VERSION shows it is version 0.3.0.dev0, but I find some > >>>> files are still not same as the newest file in > >>>> https://github.com/numenta/nupic. > >>>> For example, the files in /nupic/examples/network are not the same. > >>>> > >>>> Maybe it's not your duty to answer this kind of questions. But I really > >>>> don't know who can help me to solve it. So hoping for your reply. Thank > >>>> you > >>>> so much. > >>>> > >>>> Yajingfu > >>> > >>> > >>
