From efcf3547814c610f79e57a37f4b82f085246d6c5 Mon Sep 17 00:00:00 2001 From: sunyinqi0508 Date: Thu, 13 Oct 2022 23:54:08 +0800 Subject: [PATCH 1/5] Delete .Dockerfile.swp --- .Dockerfile.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .Dockerfile.swp diff --git a/.Dockerfile.swp b/.Dockerfile.swp deleted file mode 100644 index 10ca7bab25c5ccabfc7d729782a090293ac28c37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2O-~a+7{>?W5!7g+iC!Ly;UMmA3z`s;YM?EIkha=}1|vz?mtnhMyF1Lx3XP(7 z@jH0)qIchJdh@6sKtF(f2cPY>_>ur7oJgKY{@Kp%%>Vh%Z}zh3IQiC66=uu=!*-6b z&oAz{<;$b&IfE3Zzc#a6aBSc=!_>XqCCz)UmK6SKO9v$C|sBaM`oU zvAfCTMiBCY4d@9GAOgoAFvg~*3i;GvJa-i?oL@PH7fmGsM1Tko0U|&IhyW2F0z}}X z5zu0UJ;l(c2Enfkt|R|k2VJ@l0U|&IhyW2F0z`la5CI}U1c(3;AOa_lfbB7sA7$(< zD*gX|`2GL$EMq@VUr}FBuTig1KB|m*eul9<)FsqK)Tc4VKBD$e&rnTN17)CYpiZN{ zV~ua952*L3cc`@P8x%DnKm>>Y5g-CYfCvx)B0vO)z##-m)iSsqWao#cU}6G9Pj}*I z8ib6yLYtz8-ykcsBL|JcLLij}nMAN1gdsRd5PIO+Zihn<=@^2p?c=%RO05M;&33t7 zTCOzOOVzo>O0fW?)zzXK+L1pwX%uc|C5K6jE{H&&iPAP28*&&I&p&S^f#h8tX=Umi zoz3$D4Q?1m96DMHHEUUTr;|9Q8+R?0M7xmWk5b zGkxKko;5H@d;8hZ&m7*5rEhuhb`-|8r>tsPvOI4r-d!}7EBDh`i~%+w5%>n=JnsC5 z4UV!PckNNV*=|)DyEzzCgS7}B8A`gxFj^_vo7( my3y&5Wqaoeu$&;W99wm=U#i2{LZe=V#7QEZ%!c@`VD?{Tyhqpo From 31c4dd8681d06329dcd005735db32b64faffd884 Mon Sep 17 00:00:00 2001 From: sunyinqi0508 Date: Fri, 14 Oct 2022 00:40:52 +0800 Subject: [PATCH 2/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b993728..388f193 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ AQuery++ Database is a cross-platform, In-Memory Column-Store Database that inco - See installation instructions from [docker.com](https://www.docker.com). Run **docker desktop** to start docker engine. - In AQuery root directory, type `make docker` to build the docker image from scratch. - For Arm-based Mac users, you would have to build and run the **x86_64** docker image because MonetDB doesn't offer official binaries for arm64 Linux. (Run `docker buildx build --platform=linux/amd64 -t aquery .` instead of `make docker`) - - Finally run the image in **interactive** mode (`docker run -it aquery --name aquery`) + - Finally run the image in **interactive** mode (`docker run --name aquery -it aquery`) - When you need to access the container again run `docker start -ai aquery` - If there is a need to access the system shell within AQuery, type `dbg` to activate python interpreter and type `os.system('sh')` to launch a shell. ## CIMS Computer Lab (Only for NYU affiliates who have access) 1. Clone this git repo in CIMS. 2. Download the [patch](https://drive.google.com/file/d/1YkykhM6u0acZ-btQb4EUn4jAEXPT81cN/view?usp=sharing) - 3. Decompress the patch to any directory and execute script inside by typing (`source ./cims.sh`). Please use the source command or `. ./cims.sh` (dot space) to execute the script because it contains configurations for environment variables. + 3. Decompress the patch to any directory and execute script inside by typing (`source ./cims.sh`). Please use the source command or `. ./cims.sh` (dot space) to execute the script because it contains configurations for environment variables. Also note that this script can only work with bash and compatible shells (e.g. dash, zsh. but not csh) 4. Execute `python3 ./prompt.py` ## Singularity Container From 168c659c7b7caf2103f7529a3d1e93865d116881 Mon Sep 17 00:00:00 2001 From: sunyinqi0508 Date: Fri, 14 Oct 2022 00:42:27 +0800 Subject: [PATCH 3/5] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 388f193..505e511 100644 --- a/README.md +++ b/README.md @@ -57,12 +57,12 @@ There're multiple options to run AQuery on Windows. But for better consistency I - Copy or link `mingw64/libexec/gcc///liblto-plugin.dll` to `mingw64/lib/bfd-plugins/` For Link time optimization support on gcc-ar and gcc-ranlib - For Visual Studio: -1. Install python3.6 or above from [official website](https://www.python.org/downloads/windows/) or Microsoft Store. - 1. Install Microsoft Visual Studio 2022 or later with **Desktop development with C++** selected. - 2. Clone AQuery repo from [Github](https://github.com/sunyinqi0508/AQuery2) - 3. Install python requirements with pip `python3 -m pip install -r requirements.txt` - 4. Change the build_driver variable in aquery_config.py to "MSBuild" - 5. The libraries and headers for Monetdb are already included in msc-plugins, however you can also choose to download them from [Monetdb Easy Setup](https://www.monetdb.org/easy-setup/) and put them in the same place. + 1. Install python3.6 or above from [official website](https://www.python.org/downloads/windows/) or Microsoft Store. + 2. Install Microsoft Visual Studio 2022 or later with **Desktop development with C++** selected. + 3. Clone AQuery repo from [Github](https://github.com/sunyinqi0508/AQuery2) + 4. Install python requirements with pip `python3 -m pip install -r requirements.txt` + 5. Change the build_driver variable in aquery_config.py to "MSBuild" + 6. The libraries and headers for Monetdb are already included in msc-plugins, however you can also choose to download them from [Monetdb Easy Setup](https://www.monetdb.org/easy-setup/) and put them in the same place. - For CygWin/MinGW: 1. Install gcc and python3 using its **builtin package manager** instead of the one from python.org or windows store. (For Msys2, `pacman -S gcc python3`). Otherwise, ABI breakage may happen. From de57ca16dcb66ff03742f7ec38b4755dff488be3 Mon Sep 17 00:00:00 2001 From: sunyinqi0508 Date: Fri, 14 Oct 2022 00:45:33 +0800 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 505e511..75a6ed9 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ AQuery++ Database is a cross-platform, In-Memory Column-Store Database that inco - Finally run the image in **interactive** mode (`docker run --name aquery -it aquery`) - When you need to access the container again run `docker start -ai aquery` - If there is a need to access the system shell within AQuery, type `dbg` to activate python interpreter and type `os.system('sh')` to launch a shell. - + - Docker image is available on [Docker Hub](https://hub.docker.com/repository/docker/sunyinqi0508/aquery) but building image yourself is highly recommended (see #2) ## CIMS Computer Lab (Only for NYU affiliates who have access) 1. Clone this git repo in CIMS. 2. Download the [patch](https://drive.google.com/file/d/1YkykhM6u0acZ-btQb4EUn4jAEXPT81cN/view?usp=sharing) From 4739877d8f8998d6e126aa57461622562fa153e4 Mon Sep 17 00:00:00 2001 From: sunyinqi0508 Date: Fri, 14 Oct 2022 00:47:49 +0800 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75a6ed9..eb147a1 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ AQuery++ Database is a cross-platform, In-Memory Column-Store Database that inco - Finally run the image in **interactive** mode (`docker run --name aquery -it aquery`) - When you need to access the container again run `docker start -ai aquery` - If there is a need to access the system shell within AQuery, type `dbg` to activate python interpreter and type `os.system('sh')` to launch a shell. - - Docker image is available on [Docker Hub](https://hub.docker.com/repository/docker/sunyinqi0508/aquery) but building image yourself is highly recommended (see #2) + - Docker image is available on [Docker Hub](https://hub.docker.com/repository/docker/sunyinqi0508/aquery) but building image yourself is highly recommended (see [#2](../../issues/2)) ## CIMS Computer Lab (Only for NYU affiliates who have access) 1. Clone this git repo in CIMS. 2. Download the [patch](https://drive.google.com/file/d/1YkykhM6u0acZ-btQb4EUn4jAEXPT81cN/view?usp=sharing)