change archive

Author: springkim

FasterRCNN_SE_Detection/.vs/FasterRCNN_SE_Detection_Example/v14/.suo

@@ -75,14 +75,23 @@ class FasterRCNN {
 		m_shmem = ::CreateFileMappingA(INVALID_HANDLE_VALUE, nullptr,PAGE_READWRITE, 0, m_size, m_key_shmem.c_str());
 		m_buffer = (char*)::MapViewOfFile(m_shmem, FILE_MAP_ALL_ACCESS, 0, 0, m_size);
 		m_buffer[0] = 0;
-		//std::string exec = "python35 \"C:/Users/sprin/Downloads/FasterRCNN_SpringEdition_final/FasterRCNN_SE_Train/src/FasterRCNN_Detect_SE.py\"";
+#ifdef FasterRCNN_SE_Test
+		char* pyfile_r = "../../../FasterRCNN_SE_Train/src/FasterRCNN_Detect_SE.py";
+		char _pyfile_a[MAX_PATH] = { 0 };
+		GetFullPathNameA(pyfile_r, MAX_PATH, _pyfile_a, NULL);
+		std::string pyfile_a = _pyfile_a;
+		std::replace(pyfile_a.begin(), pyfile_a.end(), '\\', '/');
+		std::string exec = "python35 \"" + pyfile_a + "\"";
+#else
 		std::string exec = "FasterRCNN_Detect_SE.exe";
+#endif
+		
 		HWND hwnd = GetForegroundWindow();
 		std::vector<std::string> models = { "AlexNet","VGG16","VGG19" };
 		std::ostringstream oss;
-		//oss << exec << " " << m_key_shmem << " " << m_key_mutex << " " << m_size << " " << "\"" << model_path << "\"" << "\t" << filter_threshold << " " << hwnd << " " << models[m_base_model];
+		//oss << exec << " " << m_key_shmem << " " << m_key_mutex << " " << m_size << " " << "\"" << model_path << "\"" << " " << filter_threshold << " " << hwnd << " " << models[m_base_model];
 		//UINT ret=WinExec(oss.str().c_str(), SW_HIDE);
-		oss << m_key_shmem << " " << m_key_mutex << " " << m_size << " " << "\"" << model_path << "\"" << "\t" << filter_threshold << " " << hwnd << " " << models[m_base_model];
+		oss << m_key_shmem << " " << m_key_mutex << " " << m_size << " " << "\"" << model_path << "\"" << " " << filter_threshold << " " << hwnd << " " << models[m_base_model];
 		HINSTANCE ret=ShellExecuteA(NULL, "open", exec.c_str(), oss.str().c_str(), NULL, SW_HIDE);
 		if ((size_t)ret < 31) {
 			::MessageBoxA(nullptr, "FasterRCNN Detector execute failed\nIt needs \"FasterRCNN_Detect_SE.exe\".", "Error", MB_OK);

FasterRCNN_SE_Detection/FasterRCNN_SE.h

@@ -1,5 +1,6 @@
-powershell "(New-Object System.Net.WebClient).DownloadFile('https://www.dropbox.com/s/s3xel6z1e09s9cp/3rdparty.zip?dl=1','%TEMP%\3rdparty.zip')"
+powershell "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(New-Object System.Net.WebClient).DownloadFile('https://github.com/springkim/FasterRCNN_SpringEdition/releases/download/bin/3rdparty.zip','%TEMP%\3rdparty.zip')"
 powershell -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('%TEMP%\3rdparty.zip', '.'); }"
 IF EXIST "%TEMP%\3rdparty.zip" (
 	DEL "%TEMP%\3rdparty.zip"
 )
+pause

FasterRCNN_SE_Detection/download_3rdparty.bat

@@ -1 +1 @@
-powershell "(New-Object System.Net.WebClient).DownloadFile('https://www.dropbox.com/s/7h6qifihp4hn4q1/faster_rcnn_eval_VGG16_e2e_epoch%28100%29.model?dl=1','faster_rcnn_eval_VGG16_e2e_epoch(100).model')"
+powershell "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(New-Object System.Net.WebClient).DownloadFile('https://github.com/springkim/FasterRCNN_SpringEdition/releases/download/bin/faster_rcnn_eval_VGG16_e2e_epoch.100.model','faster_rcnn_eval_VGG16_e2e_epoch(100).model')"

FasterRCNN_SE_Detection/download_pretrained_model.bat

@@ -0,0 +1,5 @@
+powershell "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(New-Object System.Net.WebClient).DownloadFile('https://github.com/springkim/FasterRCNN_SpringEdition/releases/download/image/voc2007valid.zip','%TEMP%\voc2007valid.zip')"
+powershell -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('%TEMP%\voc2007valid.zip', '.'); }"
+IF EXIST "%TEMP%\voc2007valid.zip" (
+	DEL "%TEMP%\voc2007valid.zip"
+)

FasterRCNN_SE_Detection/download_voc2007train.bat

@@ -60,15 +60,18 @@ int main() {
 				std::cout << "\tPrecision : " << RP.find(i)->second.second / cnt[i] << std::endl;
 			}
 		}
-		/*cv::Mat img = cv::imread(file);
+		//continue;
+		cv::Mat img = cv::imread(file);
 		for (auto&box : boxes) {
 			ispring::CVEval::DrawBoxSE(img, box,cv::Scalar(0,0,255));
 		}
 		for (auto&box : ground_truth) {
 			ispring::CVEval::DrawBoxSE(img, box,cv::Scalar(0,255,0));
 		}
 		cv::imshow("result", img);
-		cv::waitKey(0);*/
+		if (cv::waitKey(0) == 27) {
+			break;
+		}
 	}
 	cv::destroyAllWindows();
 	detector.Release();												//Release

FasterRCNN_SE_Detection/download_voc2007valid.bat

@@ -1 +1 @@
-powershell "(New-Object System.Net.WebClient).DownloadFile('https://www.dropbox.com/s/txfkcvba15dw3c8/AlexNet_ImageNet_Caffe.model?dl=1','AlexNet_ImageNet_Caffe.model')"
+powershell "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(New-Object System.Net.WebClient).DownloadFile('https://github.com/springkim/FasterRCNN_SpringEdition/releases/download/cntk/AlexNet_ImageNet_Caffe.model','AlexNet_ImageNet_Caffe.model')"

FasterRCNN_SE_Detection/main.cpp

@@ -1 +1 @@
-powershell "(New-Object System.Net.WebClient).DownloadFile('https://www.dropbox.com/s/qedtionn73kx70s/VGG16_ImageNet_Caffe.model?dl=1','VGG16_ImageNet_Caffe.model')"
+powershell "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(New-Object System.Net.WebClient).DownloadFile('https://github.com/springkim/FasterRCNN_SpringEdition/releases/download/cntk/VGG16_ImageNet_Caffe.model','VGG16_ImageNet_Caffe.model')"

FasterRCNN_SE_Train/download_AlexNet.bat

@@ -1 +1 @@
-powershell "(New-Object System.Net.WebClient).DownloadFile('https://www.dropbox.com/s/a1aa7ngbvrp82bi/VGG19_ImageNet_Caffe.model?dl=1','VGG19_ImageNet_Caffe.model')"
+powershell "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(New-Object System.Net.WebClient).DownloadFile('https://github.com/springkim/FasterRCNN_SpringEdition/releases/download/cntk/VGG19_ImageNet_Caffe.model','VGG19_ImageNet_Caffe.model')"

FasterRCNN_SE_Train/download_VGG16.bat

@@ -1,4 +1,4 @@
-powershell "(New-Object System.Net.WebClient).DownloadFile('https://www.dropbox.com/s/9gox6h7a846ydpq/bin.zip?dl=1','%TEMP%\bin.zip')"
+powershell "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(New-Object System.Net.WebClient).DownloadFile('https://github.com/springkim/FasterRCNN_SpringEdition/releases/download/cntk/bin.zip','%TEMP%\bin.zip')"
 powershell -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('%TEMP%\bin.zip', '.'); }"
 IF EXIST "%TEMP%\bin.zip" (
 	DEL "%TEMP%\bin.zip"

FasterRCNN_SE_Train/download_VGG19.bat

@@ -1,4 +1,4 @@
-powershell "(New-Object System.Net.WebClient).DownloadFile('https://www.dropbox.com/s/lbdzx7q9vvaktpv/voc2007train.zip?dl=1','%TEMP%\voc2007train.zip')"
+powershell "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(New-Object System.Net.WebClient).DownloadFile('https://github.com/springkim/FasterRCNN_SpringEdition/releases/download/image/voc2007train.zip','%TEMP%\voc2007train.zip')"
 powershell -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('%TEMP%\voc2007train.zip', '.'); }"
 IF EXIST "%TEMP%\voc2007train.zip" (
 	DEL "%TEMP%\voc2007train.zip"

FasterRCNN_SE_Train/download_bin.bat

@@ -1,6 +1,6 @@
 ::python3.5.3 local packace.
 ::See also https://github.com/springkim/FasterRCNN_SpringEdition
-powershell "(New-Object System.Net.WebClient).DownloadFile('https://www.dropbox.com/s/o7p3byhb7j8nvsf/Python35.zip?dl=1','Python35.zip')"
+powershell "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(New-Object System.Net.WebClient).DownloadFile('https://github.com/springkim/FasterRCNN_SpringEdition/releases/download/cntk/Python35.zip','Python35.zip')"
 powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('Python35.zip', '.'); }"
 IF EXIST "Python35.zip" (
 	DEL "Python35.zip"

FasterRCNN_SE_Train/download_voc2007train.bat

@@ -1,3 +1,3 @@
 cd "bin"
-"FasterRCNN_Train_SE.exe" 100 VGG19
+"FasterRCNN_Train_SE.exe" 100 VGG16
 pause

FasterRCNN_SE_Train/src/download_python35_local.bat

@@ -2,4 +2,5 @@ set /p msg=Input commit message :
 git add -A
 git commit -m "%msg%"
 git push origin master
+pause